When attempting to serve a sles11-sp2 install from cobbler on the same
host as autotest, I got 404s for
http://<server>/cblr/links/sles11-sp2-suseboot-ppc64/media.1
with httpd complaining:
File does not exist:
x/usr/lib/python2.7/site-packages/django/contrib/admin/media/.1
This is because of the django directives from autotest being global to
apache's configuration, so they affect more than just autotest's
installation. Fix this by pushing the RewriteRules under the Location
tag.
Signed-off-by: Nishanth Aravamudan <n...@us.ibm.com>
diff --git a/apache/conf/django-directives b/apache/conf/django-directives
index de376d8..184531b 100644
--- a/apache/conf/django-directives
+++ b/apache/conf/django-directives
@@ -5,27 +5,27 @@
ERROR__DJANGO_REQUIRES_THE_PREFORK_MPM
</IfModule>
-#
-# Try to serve admin media files, no matter where django is actually installed
-# Covers python versions 2.4 through 2.7 and also django installed by
utils/build_externals.py
-#
-RewriteEngine On
-RewriteCond /usr/local/autotest/site-packages/django/contrib/admin/media -d
-RewriteRule /media(.*)
/usr/local/autotest/site-packages/django/contrib/admin/media/$1
+<Location ~ "/(afe|new_tko)/server">
+ #
+ # Try to serve admin media files, no matter where django is actually
installed
+ # Covers python versions 2.4 through 2.7 and also django installed by
utils/build_externals.py
+ #
+ RewriteEngine On
+ RewriteCond /usr/local/autotest/site-packages/django/contrib/admin/media -d
+ RewriteRule /media(.*)
/usr/local/autotest/site-packages/django/contrib/admin/media/$1
-RewriteCond /usr/lib/python2.4/site-packages/django/contrib/admin/media -d
-RewriteRule /media(.*)
/usr/lib/python2.4/site-packages/django/contrib/admin/media/$1
+ RewriteCond /usr/lib/python2.4/site-packages/django/contrib/admin/media -d
+ RewriteRule /media(.*)
/usr/lib/python2.4/site-packages/django/contrib/admin/media/$1
-RewriteCond /usr/lib/python2.5/site-packages/django/contrib/admin/media -d
-RewriteRule /media(.*)
/usr/lib/python2.5/site-packages/django/contrib/admin/media/$1
+ RewriteCond /usr/lib/python2.5/site-packages/django/contrib/admin/media -d
+ RewriteRule /media(.*)
/usr/lib/python2.5/site-packages/django/contrib/admin/media/$1
-RewriteCond /usr/lib/python2.6/site-packages/django/contrib/admin/media -d
-RewriteRule /media(.*)
/usr/lib/python2.6/site-packages/django/contrib/admin/media/$1
+ RewriteCond /usr/lib/python2.6/site-packages/django/contrib/admin/media -d
+ RewriteRule /media(.*)
/usr/lib/python2.6/site-packages/django/contrib/admin/media/$1
-RewriteCond /usr/lib/python2.7/site-packages/django/contrib/admin/media -d
-RewriteRule /media(.*)
/usr/lib/python2.7/site-packages/django/contrib/admin/media/$1
+ RewriteCond /usr/lib/python2.7/site-packages/django/contrib/admin/media -d
+ RewriteRule /media(.*)
/usr/lib/python2.7/site-packages/django/contrib/admin/media/$1
-<Location ~ "/(afe|new_tko)/server">
SetHandler python-program
PythonHandler django.core.handlers.modpython
SetEnv DJANGO_SETTINGS_MODULE frontend.settings
--
Nishanth Aravamudan <n...@us.ibm.com>
IBM Linux Technology Center
_______________________________________________
Autotest mailing list
Autotest@test.kernel.org
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
