Fix: merge conflict

[myslice.git] / apache / myslice.conf

diff --git a/apache/myslice.conf b/apache/myslice.conf
index 011502c..8f3ff2b 100644 (file)
--- a/apache/myslice.conf
+++ b/apache/myslice.conf
@@ -1,13 +1,18 @@
-## https://docs.djangoproject.com/en/1.3/howto/deployment/modwsgi/
+## better use
+# https://docs.djangoproject.com/en/1.5/howto/deployment/wsgi/modwsgi/
+# instead
 #
-#Alias /robots.txt /usr/share/myslice/all-static/robots.txt
-Alias /favicon.ico /usr/share/myslice/all-static/favicon.ico
+# XXX this is very rough, was just pasted from the (wrong) web page
+# and never tested, so feel free to rewrite completely if that sounds right
+#
+#Alias /robots.txt /usr/share/myslice/static/robots.txt
+Alias /favicon.ico /usr/share/myslice/static/favicon.ico
 
-#AliasMatch ^/([^/]*\.css) /usr/share/myslice/all-static/styles/$1
+#AliasMatch ^/([^/]*\.css) /usr/share/myslice/static/styles/$1
 
-Alias /all-static/ /usr/share/myslice/all-static/
+Alias /static/ /usr/share/myslice/static/
 
-<Directory /usr/share/myslice/all-static/>
+<Directory /usr/share/myslice/static/>
 Order deny,allow
 Allow from all
 </Directory>