summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-19 12:19:00 +0200
committervarac <varacanero@zeromail.org>2013-09-19 12:19:00 +0200
commit1ce6cb5a30c5ee73d6474ac9c1bbd4c7819d9a73 (patch)
treece7d548ec62a5d8107433318413a1e2de361c9c8 /puppet/modules/site_webapp
parente182d12c72743491805a3873e8b6cd804fe5394c (diff)
only deploy x509 stuff for nodes if it existes in hiera (Feature #3875)
Diffstat (limited to 'puppet/modules/site_webapp')
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb.pp2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index f9a4eb6b..24f9279d 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -13,6 +13,8 @@ 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']