Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #971 from groovecoder/django-admin-static

fix django admin statics
  • Loading branch information...
commit 74e9813fc5d8344f661f5ab945b2749de4e0da68 2 parents d1220ef + 18028cb
@groovecoder groovecoder authored
View
1  .gitignore
@@ -19,6 +19,7 @@ build.py
media/uploads
media/attachments
media/sitemap*
+static/
locale
xfers/*
puppet/cache/*
View
1  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/"
View
1  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'),
]
View
2  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',
Please sign in to comment.
Something went wrong with that request. Please try again.