diff options
| author | Micah <micah@leap.se> | 2016-05-03 13:21:17 -0400 |
|---|---|---|
| committer | Micah <micah@leap.se> | 2016-05-03 13:21:17 -0400 |
| commit | 3b5ce74f81bb56af0b94a119a85649446a3d6e19 (patch) | |
| tree | aa59351dc0600bfba69e9b5c84d69b3c1dd80dfd /puppet/modules/site_static | |
| parent | e0e3bc3478b3b7ca1afe24ff7e44dbdfa384ea44 (diff) | |
migrate from obsolete SSLCertificateChainFile apache option (#8055)
Change-Id: I20a28ae77c98071aefc1933e0ea73e5f3b895acb
Diffstat (limited to 'puppet/modules/site_static')
| -rw-r--r-- | puppet/modules/site_static/manifests/domain.pp | 8 | ||||
| -rw-r--r-- | puppet/modules/site_static/templates/apache.conf.erb | 1 |
2 files changed, 3 insertions, 6 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') diff --git a/puppet/modules/site_static/templates/apache.conf.erb b/puppet/modules/site_static/templates/apache.conf.erb index 2853c5c7..6b969d1c 100644 --- a/puppet/modules/site_static/templates/apache.conf.erb +++ b/puppet/modules/site_static/templates/apache.conf.erb @@ -56,7 +56,6 @@ SSLCertificateKeyFile /etc/x509/keys/<%= @domain %>.key SSLCertificateFile /etc/x509/certs/<%= @domain %>.crt - SSLCertificateChainFile /etc/ssl/certs/<%= @domain %>_ca.pem RequestHeader set X_FORWARDED_PROTO 'https' |