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/couchdb.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/couchdb.pp')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/couchdb.pp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp index 24f9279d..5a5cccad 100644 --- a/puppet/modules/site_webapp/manifests/couchdb.pp +++ b/puppet/modules/site_webapp/manifests/couchdb.pp @@ -13,18 +13,7 @@ class site_webapp::couchdb { $couch_client = $stunnel['couch_client'] $couch_client_connect = $couch_client['connect'] - include site_config::x509::cert_key - include site_config::x509::ca include x509::variables - $x509 = hiera('x509') - $key = $x509['key'] - $cert = $x509['cert'] - $ca = $x509['ca_cert'] - $cert_name = 'leap_couchdb' - $ca_name = 'leap_ca' - $ca_path = "${x509::variables::local_CAs}/${ca_name}.crt" - $cert_path = "${x509::variables::certs}/${cert_name}.crt" - $key_path = "${x509::variables::keys}/${cert_name}.key" file { '/srv/leap/webapp/config/couchdb.yml.admin': @@ -73,10 +62,10 @@ class site_webapp::couchdb { $couchdb_stunnel_client_defaults = { 'connect_port' => $couch_client_connect, - 'client' => true, - 'cafile' => $ca_path, - 'key' => $key_path, - 'cert' => $cert_path, + 'client' => true, + 'cafile' => "${x509::variables::local_CAs}/${site_config::params::ca_name}.crt", + 'key' => "${x509::variables::keys}/${site_config::params::cert_name}.key", + 'cert' => "${x509::variables::certs}/${site_config::params::cert_name}.crt", } create_resources(site_stunnel::clients, $couch_client, $couchdb_stunnel_client_defaults) |