From: Julien Cristau <jcristau@debian.org>
Date: Mon, 4 Jul 2016 19:33:22 +0000 (+0200)
Subject: Stop using SSLCertificateChainFile
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=148f8bf7c355fdea0d81a741202480fcfe5cdd32;p=mirror%2Fdsa-puppet.git

Stop using SSLCertificateChainFile

It's deprecated since apache 2.4, the chain now lives with the
certificate.
---

diff --git a/modules/apache2/files/puppet-ssl-macros b/modules/apache2/files/puppet-ssl-macros
index e19a000dc..75bdecc2d 100644
--- 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
-      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>