Move default webpage from apache to webserver module

[mirror/dsa-puppet.git] / modules / apache2 / files / puppet-ssl-macros

diff --git a/modules/apache2/files/puppet-ssl-macros b/modules/apache2/files/puppet-ssl-macros
index 69bc424..75bdecc 100644 (file)
--- 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>