summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-05-03 13:21:17 -0400
committerMicah <micah@leap.se>2016-05-03 13:21:17 -0400
commit3b5ce74f81bb56af0b94a119a85649446a3d6e19 (patch)
treeaa59351dc0600bfba69e9b5c84d69b3c1dd80dfd /puppet/modules/site_config/manifests
parente0e3bc3478b3b7ca1afe24ff7e44dbdfa384ea44 (diff)
migrate from obsolete SSLCertificateChainFile apache option (#8055)
Change-Id: I20a28ae77c98071aefc1933e0ea73e5f3b895acb
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/x509/commercial/cert.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/modules/site_config/manifests/x509/commercial/cert.pp b/puppet/modules/site_config/manifests/x509/commercial/cert.pp
index d71d9838..9dd6ffcd 100644
--- a/puppet/modules/site_config/manifests/x509/commercial/cert.pp
+++ b/puppet/modules/site_config/manifests/x509/commercial/cert.pp
@@ -4,9 +4,12 @@ class site_config::x509::commercial::cert {
$x509 = hiera('x509')
$cert = $x509['commercial_cert']
+ $ca = $x509['commercial_ca_cert']
+
+ $cafile = "${cert}\n${ca}"
x509::cert { $site_config::params::commercial_cert_name:
- content => $cert
+ content => $cafile
}
}