projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'stapelberg/dyn'
[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
e19a000
..
75bdecc
100644
(file)
--- a/
modules/apache2/files/puppet-ssl-macros
+++ b/
modules/apache2/files/puppet-ssl-macros
@@
-9,9
+9,8
@@
<Macro common-debian-service-ssl $name>
SSLEngine on
<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>