Changeset 2442 for trunk/locker/deploy

Timestamp:

Jun 28, 2013, 9:08:30 PM (11 years ago)

Author:

lfaraone

Message:

Reverting 2441; should commit on locker-dev first.

File:

• trunk/locker/deploy/bin/django (modified) (4 diffs)

trunk/locker/deploy/bin/django

@@ -35 +35 @@
 close FASTCGI;
 chmod 0755, "index.fcgi";
-
-open README, ">README.txt";
-print README <<EOF;
-This directory contains index.fcgi, a script that serves up your Django site.
-
-To modify your Django project access the files in
-        /mit/$user/Scripts/django/$name
-
-Files placed in this directory will be served directly to users without
-being processed by Django.
-
-Static files live in the "static" subdirectory; you should not add things
-there directly but instead place them with the relevant application as you
-normally would, then run "python manage.py collectstatic" from the above
-directory; see <https://docs.djangoproject.com/en/1.5/howto/static-files/>.
-
-  -- Scripts Team 2013-06-28
-EOF
-close README;
-chmod 0555, "README.txt";
 
 open HTACCESS, ">.htaccess";
@@ -93 +73 @@
   } elsif (/Chicago/) {
     $_ =~ s/Chicago/New_York/;
-  } elsif (/^STATIC_URL/) {
-    $_ = "STATIC_URL = '//$USER.$server/$name/static/'";
-  } elsif (/^STATIC_ROOT/) {
-    $_ = "STATIC_ROOT = '/mit/$USER/web_scripts/$addrend/static/'";
+  } elsif (/^ADMIN_MEDIA_PREFIX/) {
+    $_ = "ADMIN_MEDIA_PREFIX = '/__scripts/django/media/'";
   } elsif (/^INSTALLED_APPS/) {
     print NEWSETTINGS "$_\n";
@@ -121 +99 @@
   } elsif (/^#.*admin.autodiscover/) {
     $_ =~ s/^# *//;
-  } elsif (/^ *# url\(r\'\^admin\//) {
+  } elsif (/^ *# *\(r\'\^admin\//) {
     $_ =~ s/# *//;
   }
@@ -131 +109 @@
 
 chdir "..";
-
-system(qw{python manage.py collectstatic --noinput}) == 0 or die "\nFailed to collect static files.\n\n";
 
 print "Initializing your project's SQL database schema...\n";