Ignore:
Timestamp:
Jan 12, 2010, 11:55:27 PM (12 years ago)
Author:
ezyang
Message:
Merged in changes from trunk

--- Merging r1262 through r1413 into 'deploy/bin':
U    deploy/bin/django
   C deploy/bin/rails
   > Resolved by accepting working copy
--- Merging r1221 through r1413 into '.':
U    sql/bin/get-password
U    sql/bin/save-password
U    doc/tickets/rt.txt
U    doc/tickets/cnames.txt
U    bin/fix-php-ini
   C bin/scripts-rails
   > Resolved by accepting working copy
Skipped 'bin/for-each-server'
 U   bin
U    sbin/parallel-find.pl
U    sbin/commit-email.pl
U    sbin/commit-zephyr
Summary of conflicts:
  Tree conflicts: 2
  Skipped paths: 1

Location:
branches/locker-dev/locker
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/locker-dev/locker

  • branches/locker-dev/locker/deploy/bin

    • Property svn:mergeinfo deleted
  • branches/locker-dev/locker/deploy/bin/django

    r1223 r1414  
    1616print FASTCGI <<EOF;
    1717#!/usr/bin/env python
    18 import sys, os
     18import sys, os, time, threading, django.utils.autoreload
    1919sys.path.insert(0, "/mit/$USER/Scripts/django")
    2020os.chdir("/mit/$USER/Scripts/django/$name")
    2121os.environ['DJANGO_SETTINGS_MODULE'] = "$name.settings"
     22
     23def reloader_thread():
     24  while True:
     25    if django.utils.autoreload.code_changed():
     26      os._exit(3)
     27    time.sleep(1)
     28t = threading.Thread(target=reloader_thread)
     29t.daemon = True
     30t.start()
    2231
    2332from django.core.servers.fastcgi import runfastcgi
     
    3847
    3948chdir "/mit/$USER/Scripts/django/";
    40 system qw{django-admin.py startproject}, $name;
     49system qw{django-admin startproject}, $name;
    4150chdir "$name";
    4251
     
    6574    while (<SETTINGS>) {
    6675      if (/^\)/) {
    67         print NEWSETTINGS "    'django.contrib.admin',\n";
    68         print NEWSETTINGS "    'django.contrib.admindocs',\n";
     76        print NEWSETTINGS "    'django.contrib.admin',\n";
     77        print NEWSETTINGS "    'django.contrib.admindocs',\n";
    6978      }
    7079      print NEWSETTINGS $_;
     
    114123print "  /mit/$USER/Scripts/django/$name/\n";
    115124print "To access manage.py, run 'ssh -k $USER\@scripts' and cd to the above directory.\n\n";
    116 print "When you edit your code, run the command\n";
    117 print "  touch /mit/$USER/web_scripts/$addrend/index.fcgi\n";
    118 print "before testing, to cause your site to reload the new code.\n";
    119125press_enter;
    120126
Note: See TracChangeset for help on using the changeset viewer.