lib/apache2: Update sample configuration files for new staticfiles application

The static files app will collect all of the static files into
STATIC_ROOT, which is under htdocs/static/.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/lib/apache2/patchwork.wsgi.conf b/lib/apache2/patchwork.wsgi.conf
index 3756e5ab2761be25960f53670d3ba0842462c91b..cce7e7ab1bf4f4fe87f41bf154cce2c119bcc8cf 100644 (file)
--- a/lib/apache2/patchwork.wsgi.conf
+++ b/lib/apache2/patchwork.wsgi.conf
@@ -1,20 +1,8 @@
-<IfModule mod_alias.c>
-        Alias /images/ "/srv/patchwork/htdocs/images/"
-        Alias /css/ "/srv/patchwork/htdocs/css/"
-        Alias /js/ "/srv/patchwork/htdocs/js/"
-        Alias /robots.txt "/srv/patchwork/htdocs/robots.txt"
-        <Directory "/srv/patchwork/htdocs">
-                Order allow,deny
-                Allow from all
-        </Directory>
-
-        Alias /media/ "/usr/share/python-support/python-django/django/contrib/admin/media/"
-
-        <Directory "/usr/share/python-support/python-django/django/contrib/admin/media/">
-                Order allow,deny
-                Allow from all
-        </Directory>
-</IfModule>
+Alias /static/ "/srv/patchwork/htdocs/static/"
+<Directory "/srv/patchwork/htdocs">
+       Order allow,deny
+       Allow from all
+</Directory>
 
 WSGIScriptAlias / "/srv/patchwork/lib/apache2/patchwork.wsgi"
 WSGIPassAuthorization On