X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=apache%2Fmyslice.conf;h=8ee84d0fba9b75b2ed6baa7864ee5ff5d7812e5e;hb=c22a2a779edb285797b4b0a7b6297181f2165c05;hp=a3d1d32baa0e0497d2a4323640a8ddf94d28819d;hpb=ea15d8f8641500ff6a551eaa5bdd8bf1e0674e86;p=myslice.git

diff --git a/apache/myslice.conf b/apache/myslice.conf
index a3d1d32b..8ee84d0f 100644
--- a/apache/myslice.conf
+++ b/apache/myslice.conf
@@ -1,25 +1,60 @@
-## better use
-# https://docs.djangoproject.com/en/1.5/howto/deployment/wsgi/modwsgi/
-# instead
-#
-# 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/all-static/robots.txt
-Alias /favicon.ico /usr/share/myslice/all-static/favicon.ico
+# xxx it might be smarter to install wsgi.py in some other location 
+# so we don't have to hard-wire these paths here
+# xxx it might also be helpful to set up a specific log channel for this
+# e.g. in /var/log/myslice.log
+<VirtualHost *:80>
+	WSGIDaemonProcess myslice processes=2 threads=25
+	WSGIProcessGroup myslice
+	CustomLog ${APACHE_LOG_DIR}/myslice-access.log common
+	ErrorLog ${APACHE_LOG_DIR}/myslice-error.log
+        WSGIScriptAlias / /usr/lib/python2.7/dist-packages/myslice/wsgi.py
+        <Directory /usr/share/unfold/myslice>
+        <Files wsgi.py>
+        Order deny,allow
+        Allow from all
+        </Files>
+        </Directory>
+        Alias /static/ /usr/share/unfold/static/
+        <Directory /usr/share/unfold/static>
+        Order deny,allow
+        Allow from all
+        </Directory>
+</VirtualHost>
 
-#AliasMatch ^/([^/]*\.css) /usr/share/myslice/all-static/styles/$1
+# This port (not necessarily well picked) is configured 
+# with client-certificate required
+# corresponding trusted roots (e.g. ple.gid and plc.gid) should be 
+# configured in /etc/unfold/trusted_roots
+# check Jordan's email and pointer to trac, although we do not want 
+# this to be optional on that port
 
-Alias /all-static/ /usr/share/myslice/all-static/
+<VirtualHost *:443>
+	WSGIDaemonProcess myslice-ssl processes=2 threads=25
+	WSGIProcessGroup myslice-ssl
+	CustomLog ${APACHE_LOG_DIR}/myslice-ssl-access.log common
+	ErrorLog ${APACHE_LOG_DIR}/myslice-ssl-error.log
+        WSGIScriptAlias / /usr/lib/python2.7/dist-packages/myslice/wsgi.py
+        <Directory /usr/share/unfold/apache>
+        <Files myslice.wsgi>
+        Order deny,allow
+        Allow from all
+        </Files>
+        </Directory>
+        Alias /static/ /usr/share/unfold/static/
+        <Directory /usr/share/unfold/static>
+        Order deny,allow
+        Allow from all
+        </Directory>
 
-<Directory /usr/share/myslice/all-static/>
-Order deny,allow
-Allow from all
-</Directory>
+	SSLEngine on
+	SSLVerifyClient require
+	SSLVerifyDepth 5
+# make this a symlink to /etc/sfa/trusted_roots if that makes sense in your env.
+	SSLCACertificatePath /etc/unfold/trusted_roots
+# see init-ssl.sh for how to create self-signed stuff in here
+	SSLCertificateFile    /etc/unfold/myslice.cert
+	SSLCertificateKeyFile /etc/unfold/myslice.key
 
-WSGIScriptAlias / /usr/share/myslice/apache/myslice.wsgi
-
-<Directory /usr/share/myslice/apache>
-Order allow,deny
-Allow from all
-</Directory>
+#	SSLOptions +StdEnvVars +ExportCertData
+	SSLOptions +StdEnvVars
+</VirtualHost>