X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fpuppet-config.erb;h=3a7134d45b1f76e118faa95306b0c3f59d14bd04;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=5aa2c11f4bf9ae91012cfb4461e36c2365d431f6;hpb=6b5309cf417a7c629ae1a44c9420fe686804b626;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/puppet-config.erb b/modules/apache2/templates/puppet-config.erb
index 5aa2c11f4..3a7134d45 100644
--- a/modules/apache2/templates/puppet-config.erb
+++ b/modules/apache2/templates/puppet-config.erb
@@ -8,8 +8,27 @@
     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
+  <% end -%>
 
+  <%- if has_variable?("apache2deb9") && @apache2deb9 == "true" -%>
     SSLUseStapling On
-    SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_stapling(32768)
+
+    # the default size is 32k, but we make it 1M.
+    # | If more than a few SSL certificates are used for the server
+    # |
+    # | OCSP responses are stored in the SSL stapling cache. While the
+    # | responses are typically a few hundred to a few thousand bytes in size,
+    # | mod_ssl supports OCSP responses up to around 10K bytes in size. With more
+    # | than a few certificates, the stapling cache size (32768 bytes in the
+    # | example above) may need to be increased. Error message AH01929 will be
+    # | logged in case of an error storing a response.
+    # [ https://httpd.apache.org/docs/2.4/ssl/ssl_howto.html#ocspstapling ]
+
+    SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_stapling(1048576)
+    SSLStaplingReturnResponderErrors off
   <% end -%>
 </IfModule>
+
+<IfModule mod_autoindex.c>
+  IndexOptions SuppressDescription
+</IfModule>