Currently, server installations can either rely on Django be installed in an operating system default path, or on autotest local site-packages (/usr/local/autotest/site-packages).
The added directives to Apache configuration attempt to serve media files despite how they were installed. Signed-off-by: Cleber Rosa <[email protected]> --- apache/conf/django-directives | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/apache/conf/django-directives b/apache/conf/django-directives index 2c604a1..a5fe7e2 100644 --- a/apache/conf/django-directives +++ b/apache/conf/django-directives @@ -5,7 +5,25 @@ ERROR__DJANGO_REQUIRES_THE_PREFORK_MPM </IfModule> -Alias /media "/usr/local/autotest/site-packages/django/contrib/admin/media" +# +# 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.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.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|planner)/server"> SetHandler python-program -- 1.7.5.2 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
