summaryrefslogtreecommitdiffstats
path: root/lib/apache2
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2015-05-24 17:31:56 +0800
committerJeremy Kerr <jk@ozlabs.org>2015-05-27 10:26:41 +0800
commit289ada39c7950a4d8c2a9fbf8993cab0642f8f20 (patch)
treeb4c7d3b26d327a56130756d2753fc10348b9c0bc /lib/apache2
parent74eb8c94a4fb7642c7e94d2bc09e610e55347d58 (diff)
downloadpatchwork-289ada39c7950a4d8c2a9fbf8993cab0642f8f20.tar.bz2
patchwork-289ada39c7950a4d8c2a9fbf8993cab0642f8f20.tar.xz
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>
Diffstat (limited to 'lib/apache2')
-rw-r--r--lib/apache2/patchwork.wsgi.conf22
1 files changed, 5 insertions, 17 deletions
diff --git a/lib/apache2/patchwork.wsgi.conf b/lib/apache2/patchwork.wsgi.conf
index 3756e5a..cce7e7a 100644
--- 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