summaryrefslogtreecommitdiff
path: root/puppet/modules/site_static/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_static/manifests
parente0e3bc3478b3b7ca1afe24ff7e44dbdfa384ea44 (diff)
migrate from obsolete SSLCertificateChainFile apache option (#8055)
Change-Id: I20a28ae77c98071aefc1933e0ea73e5f3b895acb
Diffstat (limited to 'puppet/modules/site_static/manifests')
-rw-r--r--puppet/modules/site_static/manifests/domain.pp8
1 files changed, 3 insertions, 5 deletions
diff --git a/puppet/modules/site_static/manifests/domain.pp b/puppet/modules/site_static/manifests/domain.pp
index 8b9378f2..b26cc9e3 100644
--- a/puppet/modules/site_static/manifests/domain.pp
+++ b/puppet/modules/site_static/manifests/domain.pp
@@ -11,22 +11,20 @@ define site_static::domain (
$domain = $name
$base_dir = '/srv/static'
+ $cafile = "${cert}\n${ca_cert}"
+
if is_hash($locations) {
create_resources(site_static::location, $locations)
}
x509::cert { $domain:
- content => $cert,
+ content => $cafile,
notify => Service[apache]
}
x509::key { $domain:
content => $key,
notify => Service[apache]
}
- x509::ca { "${domain}_ca":
- content => $ca_cert,
- notify => Service[apache]
- }
apache::vhost::file { $domain:
content => template('site_static/apache.conf.erb')