apache/django-directives: Update to Django 1.4

Django 1.4 does change the location of the CSS files for the admin interface, so let's add an extra rule for that. Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
spcui · Jun 5, 2012 · 0d22188 · 0d22188
1 parent 6c5dd2f
commit 0d22188
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/apache/conf/django-directives b/apache/conf/django-directives
@@ -13,6 +13,10 @@ RewriteEngine On
 RewriteCond /usr/local/autotest/site-packages/django/contrib/admin/media -d
 RewriteRule /media/(css|img|js)(.*) /usr/local/autotest/site-packages/django/contrib/admin/media/$1/$2
 
+# Django 1.4 does change location of the admin css files
+RewriteCond /usr/local/autotest/site-packages/django/contrib/admin/static/admin -d
+RewriteRule /media/(css|img|js)(.*) /usr/local/autotest/site-packages/django/contrib/admin/static/admin/$1/$2
+
 RewriteCond /usr/lib/python2.4/site-packages/django/contrib/admin/media -d
 RewriteRule /media/(css|img|js)(.*) /usr/lib/python2.4/site-packages/django/contrib/admin/media/$1/$2
 
@@ -25,6 +29,10 @@ RewriteRule /media/(css|img|js)(.*) /usr/lib/python2.6/site-packages/django/cont
 RewriteCond /usr/lib/python2.7/site-packages/django/contrib/admin/media -d
 RewriteRule /media/(css|img|js)(.*) /usr/lib/python2.7/site-packages/django/contrib/admin/media/$1/$2
 
+# Django 1.4 does change location of the admin css files
+RewriteCond /usr/lib/python2.7/site-packages/django/contrib/admin/static/admin -d
+RewriteRule /media/(css|img|js)(.*) /usr/lib/python2.7/site-packages/django/contrib/admin/static/admin/$1/$2
+
 <Location ~ "/(afe|new_tko)/server">
     SetHandler python-program
     PythonHandler django.core.handlers.modpython