From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 2 Jun 2015 14:45:24 +0000 (+0200)
Subject: Revert "Enable OCSP stapling on jessie"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ab0cde232e4709343a4369548a123efc43446a26;p=mirror%2Fdsa-puppet.git

Revert "Enable OCSP stapling on jessie"

This reverts commit 6b5309cf417a7c629ae1a44c9420fe686804b626.

Apache fails with its mutexes all the time, disable OCSP stapling.
---

diff --git a/modules/apache2/templates/puppet-config.erb b/modules/apache2/templates/puppet-config.erb
index 5aa2c11f4..fca5a8b44 100644
--- a/modules/apache2/templates/puppet-config.erb
+++ b/modules/apache2/templates/puppet-config.erb
@@ -8,8 +8,5 @@
     SSLCipherSuite ECDH+AESGCM:ECDH+AES256:ECDH+AES128:ECDH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!eNULL:!LOW:!MD5:!EXP:!RC4:!SEED:!DSS
   <% else -%>
     SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!eNULL:!LOW:!MD5:!EXP:!RC4:!SEED:!DSS
-
-    SSLUseStapling On
-    SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_stapling(32768)
   <% end -%>
 </IfModule>