diff options
| author | varac <varacanero@zeromail.org> | 2013-09-24 19:08:49 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-24 19:08:49 +0200 |
| commit | 372c2f96997f90ae9bfd6c3315e7244ce851c460 (patch) | |
| tree | 7e19f0933b3eb79c179142d4d6ff2eba24116aae /puppet/modules/site_nickserver | |
| parent | d8b9ab39d333de6494e5006b3ba4abf4b8901bca (diff) | |
| parent | abb03cd19389188c38ccaeb96e3136cac5397563 (diff) | |
Merge branch 'feature/3916_Webapp_doesn_t_serve_commercial_cert' into develop
Diffstat (limited to 'puppet/modules/site_nickserver')
| -rw-r--r-- | puppet/modules/site_nickserver/manifests/init.pp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp index a12ed3a2..bf0511d5 100644 --- a/puppet/modules/site_nickserver/manifests/init.pp +++ b/puppet/modules/site_nickserver/manifests/init.pp @@ -38,7 +38,8 @@ class site_nickserver { $address_domain = $domain['full_suffix'] - include site_config::x509::cert_key + include site_config::x509::cert + include site_config::x509::key include site_config::x509::ca # @@ -126,7 +127,8 @@ class site_nickserver { hasstatus => true, require => [ File['/etc/init.d/nickserver'], - Class['Site_config::X509::Cert_key'], + Class['Site_config::X509::Key'], + Class['Site_config::X509::Cert'], Class['Site_config::X509::Ca'] ]; } |