eximconf: unfold Subject headers before processing in RT routers
[mirror/dsa-puppet.git] / modules / apache2 / files / puppet-ssl-macros
index db298bb..75bdecc 100644 (file)
@@ -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>