diff options
author | varac <varacanero@zeromail.org> | 2013-09-19 13:11:24 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-09-19 13:11:24 +0200 |
commit | b798d716e5219d00b5b94ce8b80566e4b3bf0899 (patch) | |
tree | 0e45d9ea6e4502c33bc6facd0684cf962e724d17 /puppet/modules/site_webapp/manifests/apache.pp | |
parent | d7aca479f254ce4cbe58ee2a2197ea5c6d02de53 (diff) |
webapp: Depend services on deployment of default key, cert and ca (Feature #3838)
Diffstat (limited to 'puppet/modules/site_webapp/manifests/apache.pp')
-rw-r--r-- | puppet/modules/site_webapp/manifests/apache.pp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp index 4331afe4..3dd1c4c7 100644 --- a/puppet/modules/site_webapp/manifests/apache.pp +++ b/puppet/modules/site_webapp/manifests/apache.pp @@ -8,9 +8,15 @@ class site_webapp::apache { $commercial_key = $x509['commercial_key'] $commercial_cert = $x509['commercial_cert'] $commercial_root = $x509['commercial_ca_cert'] - $api_key = $x509['key'] - $api_cert = $x509['cert'] - $api_root = $x509['ca_cert'] + + include site_config::x509::cert_key + include site_config::x509::ca + + include x509::variables + + X509::Cert[$site_config::params::cert_name] ~> Service[apache] + X509::Key[$site_config::params::cert_name] ~> Service[apache] + X509::Ca[$site_config::params::ca_name] ~> Service[apache] class { '::apache': no_default_site => true, ssl => true } @@ -34,29 +40,17 @@ class site_webapp::apache { 'leap_webapp': content => $commercial_key, notify => Service[apache]; - - 'leap_api': - content => $api_key, - notify => Service[apache]; } x509::cert { 'leap_webapp': content => $commercial_cert, notify => Service[apache]; - - 'leap_api': - content => $api_cert, - notify => Service[apache]; } x509::ca { 'leap_webapp': content => $commercial_root, notify => Service[apache]; - - 'leap_api': - content => $api_root, - notify => Service[apache]; } } |