summaryrefslogtreecommitdiff
path: root/puppet/modules/soledad/manifests/server.pp
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/soledad/manifests/server.pp
parente182d12c72743491805a3873e8b6cd804fe5394c (diff)
only deploy x509 stuff for nodes if it existes in hiera (Feature #3875)
Diffstat (limited to 'puppet/modules/soledad/manifests/server.pp')
-rw-r--r--puppet/modules/soledad/manifests/server.pp3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 393d416a..c0af238c 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -9,6 +9,9 @@ class soledad::server {
$couchdb_user = $couchdb['couchdb_admin_user']['username']
$couchdb_password = $couchdb['couchdb_admin_user']['password']
+ include site_config::x509::cert_key
+ include site_config::x509::ca
+
$x509 = hiera('x509')
$x509_key = $x509['key']
$x509_cert = $x509['cert']