Skip to content
This repository has been archived by the owner on Aug 26, 2022. It is now read-only.

Commit

Permalink
Merge pull request #971 from groovecoder/django-admin-static
Browse files Browse the repository at this point in the history
fix django admin statics
  • Loading branch information
groovecoder committed Apr 1, 2013
2 parents d1220ef + 18028cb commit 74e9813
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -19,6 +19,7 @@ build.py
media/uploads
media/attachments
media/sitemap*
static/
locale
xfers/*
puppet/cache/*
Expand Down
1 change: 1 addition & 0 deletions puppet/files/etc/apache2/conf.d/mozilla-kuma-apache.conf
Expand Up @@ -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/"

Expand Down
1 change: 1 addition & 0 deletions scripts/update_site.py
Expand Up @@ -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'),
]

Expand Down
2 changes: 2 additions & 0 deletions settings.py
Expand Up @@ -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

Expand Down Expand Up @@ -408,6 +409,7 @@ def lazy_language_deki_map():
'django.contrib.messages',
'django.contrib.admin',
'django.contrib.sitemaps',
'django.contrib.staticfiles',

# BrowserID
'django_browserid',
Expand Down

0 comments on commit 74e9813

Please sign in to comment.