summaryrefslogtreecommitdiff
path: root/puppet/modules/site_mx
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-17 16:43:20 +0200
committervarac <varacanero@zeromail.org>2013-09-17 16:43:20 +0200
commit5f87fcd074480cdc448e23cb78386377cc19e90b (patch)
tree5dc28b574d01d5cb07f06640d142abf8da99dac0 /puppet/modules/site_mx
parent70284fd0e786ad838fbbd40c816f6c0d01cc1629 (diff)
parent3e5e685200e9b5c3ac8567100e552929ea55d8e8 (diff)
Merge branch 'feature/3817_3836_3837_Duplicate_declarations' into develop
Diffstat (limited to 'puppet/modules/site_mx')
-rw-r--r--puppet/modules/site_mx/manifests/couchdb.pp20
1 files changed, 4 insertions, 16 deletions
diff --git a/puppet/modules/site_mx/manifests/couchdb.pp b/puppet/modules/site_mx/manifests/couchdb.pp
index f842ceab..b1f3bd02 100644
--- a/puppet/modules/site_mx/manifests/couchdb.pp
+++ b/puppet/modules/site_mx/manifests/couchdb.pp
@@ -5,23 +5,11 @@ class site_mx::couchdb {
$couch_client_connect = $couch_client['connect']
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"
+ $ca_path = "${x509::variables::local_CAs}/${site_config::params::ca_name}.crt"
+ $cert_path = "${x509::variables::certs}/${site_config::params::cert_name}.crt"
+ $key_path = "${x509::variables::keys}/${site_config::params::cert_name}.key"
- class { 'site_stunnel::setup':
- cert_name => $cert_name,
- key => $key,
- cert => $cert,
- ca_name => $ca_name,
- ca => $ca
- }
+ include site_stunnel
$couchdb_stunnel_client_defaults = {
'connect_port' => $couch_client_connect,