X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ffiles%2Fpuppet-ssl-macros;h=75bdecc2d921efba20683f65a7dae3cc21d355be;hb=7709c4b48f7dced425db4b14613c07cf0642e0b1;hp=db298bb584943912d5ae56849159893b92576891;hpb=cbc9550622c3b483a1a2d46e16b238856c904e8f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/files/puppet-ssl-macros b/modules/apache2/files/puppet-ssl-macros
index db298bb58..75bdecc2d 100644
--- a/modules/apache2/files/puppet-ssl-macros
+++ b/modules/apache2/files/puppet-ssl-macros
@@ -2,16 +2,15 @@
   <IfModule mod_macro.c>
     <Macro common-ssl-HSTS>
       <IfModule mod_headers.c>
-        # Add two month HSTS header
-        Header always add Strict-Transport-Security "max-age=5184000"
+        # Add six months HSTS header
+        Header always add Strict-Transport-Security "max-age=15552000"
       </IfModule>
     </Macro>
 
     <Macro common-debian-service-ssl $name>
       SSLEngine on
-      SSLCertificateFile    /etc/ssl/debian/certs/$name.crt
+      SSLCertificateFile    /etc/ssl/debian/certs/$name.crt-chained
       SSLCertificateKeyFile /etc/ssl/private/$name.key
-      SSLCertificateChainFile /etc/ssl/debian/certs/$name.crt-chain
     </Macro>
 
     <Macro common-debian-service-https-redirect $bind $name>