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

diff --git a/modules/apache2/files/puppet-ssl-macros b/modules/apache2/files/puppet-ssl-macros
index c56dd0060..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
+        # 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>