Permalink
Browse files

remove admin-media and ADMIN_MEDIA_PREFIX

--noinput on collectstatic for dev server
  • Loading branch information...
1 parent 18028cb commit 7e429e952038c00a94d60d1f15d2bcb4e5e04b82 @groovecoder groovecoder committed Apr 1, 2013
Showing with 1 addition and 7 deletions.
  1. +0 −1 puppet/files/etc/apache2/conf.d/mozilla-kuma-apache.conf
  2. +1 −1 scripts/update_site.py
  3. +0 −5 settings.py
@@ -35,7 +35,6 @@ WSGISocketPrefix /var/run/wsgi
Alias /media/ "/vagrant/media/"
Alias /static/ "/vagrant/static/"
Alias /uploads/ "/home/vagrant/uploads/"
- Alias /admin-media/ "/vagrant/vendor/src/django/django/contrib/admin/media/"
# This runs the python app through mod_wsgi
# More like prod, but requires a `touch /vagrant/wsgi/*` to refresh code
View
@@ -89,7 +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, 'python2.6 manage.py collectstatic --noinput'),
(EXEC, 'LANG=en_US.UTF-8 python2.6 manage.py compress_assets'),
]
View
@@ -297,11 +297,6 @@ def lazy_language_deki_map():
SERVE_MEDIA = False
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/admin-media/'
-
# Paths that don't require a locale prefix.
SUPPORTED_NONLOCALES = ('media', 'admin', 'robots.txt', 'services',
'1', 'files', '@api', )

0 comments on commit 7e429e9

Please sign in to comment.