X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=apache%2Funfold.conf;h=357db7ee28a1034addeb56aa448ee648433943e2;hb=ecf7dd5d099c5b94952b6795b748380e2284bc14;hp=61bb49f97a29d5899720a4bcfbee777935fdbab6;hpb=c622863d98f57c1cfdaf12789c41644f51dd828b;p=myslice.git
diff --git a/apache/unfold.conf b/apache/unfold.conf
index 61bb49f9..357db7ee 100644
--- a/apache/unfold.conf
+++ b/apache/unfold.conf
@@ -1,6 +1,8 @@
+# see also unfold-ssl.conf
+
WSGIDaemonProcess unfold processes=2 threads=25
- WSGIProcessGroup unfold
+ WSGIProcessGroup unfold
CustomLog ${APACHE_LOG_DIR}/unfold-access.log common
ErrorLog ${APACHE_LOG_DIR}/unfold-error.log
WSGIScriptAlias / /usr/share/unfold/apache/unfold.wsgi
@@ -16,41 +18,3 @@
Allow from all
-
-# 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
-
-
- 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/share/unfold/apache/unfold.wsgi
-
-
- Order deny,allow
- Allow from all
-
-
- Alias /static/ /usr/share/unfold/static/
-
- Order deny,allow
- Allow from all
-
-
- 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
-