X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ffiles%2Fpuppet-ssl-macros;h=75bdecc2d921efba20683f65a7dae3cc21d355be;hb=7d26559131d4900e63edae21954e5604ae1ff8d4;hp=69bc424383189ad7125d12d93173e7c78bbb9b95;hpb=28d5e073803e59886b39b0acfa8484b97a855da4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/files/puppet-ssl-macros b/modules/apache2/files/puppet-ssl-macros
index 69bc42438..75bdecc2d 100644
--- a/modules/apache2/files/puppet-ssl-macros
+++ b/modules/apache2/files/puppet-ssl-macros
@@ -1,15 +1,16 @@
 <IfModule mod_ssl.c>
   <IfModule mod_macro.c>
     <Macro common-ssl-HSTS>
-      # Add two month HSTS header
-      Header always add Strict-Transport-Security "max-age=5184000"
+      <IfModule mod_headers.c>
+        # 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>