diff options
Diffstat (limited to 'puppet/modules/site_static/manifests/domain.pp')
| -rw-r--r-- | puppet/modules/site_static/manifests/domain.pp | 8 |
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') |