summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp/manifests/couchdb.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-16 15:01:48 +0100
committervarac <varacanero@zeromail.org>2013-03-16 15:01:48 +0100
commit8c91365ca62d6f7e970f7a1fbda7be82a1fc83c3 (patch)
tree5ca58ed2e9d52f7bd4071b6902cba064a75d81f6 /puppet/modules/site_webapp/manifests/couchdb.pp
parenta275999ab39b49afa2bb0c998c58aec424b4a8c0 (diff)
parent90c5b205c4764351e6ea707b965c5e6daca1c0b7 (diff)
Merge branch 'stunnel_switch' into develop
Diffstat (limited to 'puppet/modules/site_webapp/manifests/couchdb.pp')
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb.pp9
1 files changed, 9 insertions, 0 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index 9312cdb1..b8a4201d 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -1,5 +1,9 @@
class site_webapp::couchdb {
+ $x509 = hiera('x509')
+ $key = $x509['key']
+ $cert = $x509['cert']
+ $ca = $x509['ca_cert']
$webapp = hiera('webapp')
$couchdb_hosts = $webapp['couchdb_hosts']
# for now, pick the first couchdb host before we have a working
@@ -16,4 +20,9 @@ class site_webapp::couchdb {
mode => '0600';
}
+ class { 'site_webapp::couchdb_stunnel':
+ key => $key,
+ cert => $cert,
+ ca => $ca
+ }
}