From 18028cba8e35e6e514a230d78e0e4262915c32f7 Mon Sep 17 00:00:00 2001
From: groovecoder <luke.crouch@gmail.com>
Date: Fri, 29 Mar 2013 14:53:27 -0500
Subject: [PATCH] fix django admin statics

---
 .gitignore                                               | 1 +
 puppet/files/etc/apache2/conf.d/mozilla-kuma-apache.conf | 1 +
 scripts/update_site.py                                   | 1 +
 settings.py                                              | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 427150d0f42..a87f1370823 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ build.py
 media/uploads
 media/attachments
 media/sitemap*
+static/
 locale
 xfers/*
 puppet/cache/*
diff --git a/puppet/files/etc/apache2/conf.d/mozilla-kuma-apache.conf b/puppet/files/etc/apache2/conf.d/mozilla-kuma-apache.conf
index b90617afa73..7dee535c83d 100644
--- a/puppet/files/etc/apache2/conf.d/mozilla-kuma-apache.conf
+++ b/puppet/files/etc/apache2/conf.d/mozilla-kuma-apache.conf
@@ -33,6 +33,7 @@ WSGISocketPrefix /var/run/wsgi
     </Directory>
 
     Alias /media/ "/vagrant/media/"
+    Alias /static/ "/vagrant/static/"
     Alias /uploads/ "/home/vagrant/uploads/"
     Alias /admin-media/ "/vagrant/vendor/src/django/django/contrib/admin/media/"
 
diff --git a/scripts/update_site.py b/scripts/update_site.py
index aee68188319..8cc5e915382 100755
--- a/scripts/update_site.py
+++ b/scripts/update_site.py
@@ -89,6 +89,7 @@ def update_site(env, debug):
         (CHDIR, os.path.join(here)),
         (EXEC, 'python2.6 vendor/src/schematic/schematic migrations/'),
         (EXEC, 'python2.6 manage.py migrate'),
+        (EXEC, 'python2.6 manage.py collectstatic'),
         (EXEC, 'LANG=en_US.UTF-8 python2.6 manage.py compress_assets'),
     ]
  
diff --git a/settings.py b/settings.py
index 22927a2d0bb..336c64db698 100644
--- a/settings.py
+++ b/settings.py
@@ -293,6 +293,7 @@ def lazy_language_deki_map():
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
 MEDIA_URL = '/media/'
 STATIC_URL = '/static/'
+STATIC_ROOT = path('static')
 
 SERVE_MEDIA = False
 
@@ -408,6 +409,7 @@ def lazy_language_deki_map():
     'django.contrib.messages',
     'django.contrib.admin',
     'django.contrib.sitemaps',
+    'django.contrib.staticfiles',
 
     # BrowserID
     'django_browserid',