Ticket #300: django-autoinstaller-updates.patch

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
+        ../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 should instead place them with the relevant application
+as you normally would, then run "python manage.py collectstatic" from the
+above directory.
+
+  -- lfaraone 2013-06-27
+EOF
+close README;
+chmod 0555, "README.txt";
+
 open HTACCESS, ">.htaccess";
 print HTACCESS <<EOF;
 RewriteEngine On
@@ -72 +92 @@
       next;
   } elsif (/Chicago/) {
     $_ =~ s/Chicago/New_York/;
-  } elsif (/^ADMIN_MEDIA_PREFIX/) {
-    $_ = "ADMIN_MEDIA_PREFIX = '/__scripts/django/media/'";
+  } elsif (/^STATIC_URL/) {
+    $_ = "STATIC_URL = '//$USER.$server/$name/static/'";
+  } elsif (/^STATIC_ROOT/) {
+    $_ = "STATIC_ROOT = '/mit/$USER/web_scripts/$name/static/'";
   } elsif (/^INSTALLED_APPS/) {
     print NEWSETTINGS "$_\n";
     while (<SETTINGS>) {
@@ -98 +120 @@
     $_ =~ s/^# *//;
   } elsif (/^#.*admin.autodiscover/) {
     $_ =~ s/^# *//;
-  } elsif (/^ *# *\(r\'\^admin\//) {
+  } elsif (/^ *# url\(r\'\^admin\//) {
     $_ =~ s/# *//;
   }
   print NEWURLS "$_\n";
@@ -109 +131 @@
 
 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";
 system qw{./manage.py syncdb --noinput};
 print "...done\n";