From e3783ff8e724757d85634645127b57b66efd10de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Wed, 13 Apr 2016 16:23:00 +0200
Subject: [PATCH] Added Apache 2.4 config example, updated README accordingly
---
warden3/warden_server/README | 4 +++-
.../{apache.conf.dist => apache22.conf.dist} | 0
warden3/warden_server/apache24.conf.dist | 17 +++++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
rename warden3/warden_server/{apache.conf.dist => apache22.conf.dist} (100%)
create mode 100644 warden3/warden_server/apache24.conf.dist
diff --git a/warden3/warden_server/README b/warden3/warden_server/README
index 9e46ce1..92a0180 100644
--- a/warden3/warden_server/README
+++ b/warden3/warden_server/README
@@ -79,7 +79,9 @@ C. Installation
Include /opt/warden_server_3.0/apache.conf
or paste the contents into whichever Directory, Location or VirtualHost
- you dedicate for Warden. You can use apache.conf.dist as an example.
+ you dedicate for Warden. You can use apache22.conf.dist or
+ apache24.conf.dist (for Apache version 2.2 or 2.4, respectively) as an
+ example.
You may need to change paths to certificate/key/ca material, path to
warden_server.wsgi and web path alias.
diff --git a/warden3/warden_server/apache.conf.dist b/warden3/warden_server/apache22.conf.dist
similarity index 100%
rename from warden3/warden_server/apache.conf.dist
rename to warden3/warden_server/apache22.conf.dist
diff --git a/warden3/warden_server/apache24.conf.dist b/warden3/warden_server/apache24.conf.dist
new file mode 100644
index 0000000..a65ada3
--- /dev/null
+++ b/warden3/warden_server/apache24.conf.dist
@@ -0,0 +1,17 @@
+SSLEngine on
+
+SSLVerifyClient require
+SSLVerifyDepth 4
+SSLOptions +StdEnvVars +ExportCertData
+
+#SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+
+SSLCertificateFile /opt/warden_server_3/etc/cert.pem
+SSLCertificateKeyFile /opt/warden_server_3/etc/key.pem
+SSLCACertificateFile /opt/warden_server_3/etc/tcs-ca-bundle.pem
+
+WSGIScriptAlias /warden3 /opt/warden_server_3/warden_server.wsgi
+
+<DirectoryMatch /opt/warden_server_3/warden_server.wsgi>
+ Require all granted
+</DirectoryMatch>
--
GitLab