projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
give ProxyPassReverse a path
[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>
<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
</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
SSLCertificateKeyFile /etc/ssl/private/$name.key
- SSLCertificateChainFile /etc/ssl/debian/certs/$name.crt-chain
</Macro>
<Macro common-debian-service-https-redirect $bind $name>
</Macro>
<Macro common-debian-service-https-redirect $bind $name>