SF.net SVN: gar:[25123] csw/mgar/pkg/lang-python/graphite-web/trunk/files/ httpd-graphite-vhost.conf

[dmichelsen at users.sourceforge.net]

Revision: 25123
          http://sourceforge.net/p/gar/code/25123
Author:   dmichelsen
Date:     2015-06-25 13:44:04 +0000 (Thu, 25 Jun 2015)
Log Message:
-----------
lang-python/graphite-web/trunk: Adust apache vhost config

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/graphite-web/trunk/files/httpd-graphite-vhost.conf

Modified: csw/mgar/pkg/lang-python/graphite-web/trunk/files/httpd-graphite-vhost.conf
===================================================================
--- csw/mgar/pkg/lang-python/graphite-web/trunk/files/httpd-graphite-vhost.conf	2015-06-25 12:09:54 UTC (rev 25122)
+++ csw/mgar/pkg/lang-python/graphite-web/trunk/files/httpd-graphite-vhost.conf	2015-06-25 13:44:04 UTC (rev 25123)
@@ -36,29 +36,32 @@
         # file in this directory that you can safely use, just copy it to graphite.wgsi
         WSGIScriptAlias / /etc/opt/csw/graphite/graphite.wsgi 
 
+        # The graphite.wsgi file has to be accessible by apache. It won't
+        # be visible to clients because of the DocumentRoot though.
+        <Directory /etc/opt/csw/graphite/>
+                Order deny,allow
+                Allow from all
+        </Directory>
+
         Alias /content/ /opt/csw/share/graphite/webapp/content/
         <Location "/content/">
                 SetHandler None
         </Location>
+        <Directory /opt/csw/share/graphite/webapp>
+                Order deny,allow
+                Allow from all
+        </Directory>
 
-        # XXX In order for the django admin site media to work you
-        # must change @DJANGO_ROOT@ to be the path to your django
-        # installation, which is probably something like:
-        # /usr/lib/python2.6/site-packages/django
-        Alias /media/ "@DJANGO_ROOT@/contrib/admin/media/"
+	# Temporary fix taken from
+	#   https://github.com/graphite-project/graphite-web/issues/563
+	RedirectMatch ^/admin(.*)admin/([^/]+)/([^/]+)$ /media/$2/$3
+	Alias /media/ /opt/csw/lib/python2.7/site-packages/django/contrib/admin/static/admin/
         <Location "/media/">
                 SetHandler None
         </Location>
-
-        # The graphite.wsgi file has to be accessible by apache. It won't
-        # be visible to clients because of the DocumentRoot though.
-        <Directory /etc/opt/csw/graphite/>
+        <Directory /opt/csw/lib/python2.7/site-packages/django/contrib/admin/static>
                 Order deny,allow
                 Allow from all
         </Directory>
-        <Directory /opt/csw/share/graphite/webapp>
-                Order deny,allow
-                Allow from all
-        </Directory>
 
 </VirtualHost>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.