X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=apache%2Funfold.conf;h=357db7ee28a1034addeb56aa448ee648433943e2;hp=ff3de7f00dbcf0e3b8d40d8c83801bf3ad87f1db;hb=78ed9c4a6e34dd6297ec15fc6767183ebd68609e;hpb=be5a6567c0cb7244b1843467844bb7f1efff1a51

diff --git a/apache/unfold.conf b/apache/unfold.conf
index ff3de7f0..357db7ee 100644
--- a/apache/unfold.conf
+++ b/apache/unfold.conf
@@ -1,3 +1,5 @@
+# see also unfold-ssl.conf
+
 <VirtualHost *:80>
 	WSGIDaemonProcess unfold processes=2 threads=25
 	WSGIProcessGroup  unfold
@@ -16,41 +18,3 @@
         Allow from all
         </Directory>
 </VirtualHost>
-
-# 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
-
-<VirtualHost *:443>
-	WSGIDaemonProcess unfold-ssl processes=2 threads=25
-	WSGIProcessGroup  unfold-ssl
-	CustomLog ${APACHE_LOG_DIR}/myslice-ssl-access.log common
-	ErrorLog ${APACHE_LOG_DIR}/myslice-ssl-error.log
-        WSGIScriptAlias / /usr/share/unfold/apache/unfold.wsgi
-        <Directory /usr/share/unfold/apache/>
-        <Files unfold.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>
-
-	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
-
-#	SSLOptions +StdEnvVars +ExportCertData
-	SSLOptions +StdEnvVars
-</VirtualHost>