summaryrefslogtreecommitdiff
path: root/puppet/modules/soledad/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-24 09:09:30 +0200
committervarac <varacanero@zeromail.org>2013-09-24 09:20:42 +0200
commitffa4504f81c0abecc62b068951ec147741028128 (patch)
tree960a6b7c0e40457c124463fab85acca2e2d16b19 /puppet/modules/soledad/manifests
parentd8b9ab39d333de6494e5006b3ba4abf4b8901bca (diff)
seperate cert and key deployment (#3918)
Diffstat (limited to 'puppet/modules/soledad/manifests')
-rw-r--r--puppet/modules/soledad/manifests/server.pp6
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 0c073443..6ccd934a 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -9,7 +9,8 @@ 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::cert
+ include site_config::x509::key
include site_config::x509::ca
$soledad = hiera('soledad')
@@ -52,7 +53,8 @@ class soledad::server {
require => [
Class['soledad'],
Package['soledad-server'],
- Class['Site_config::X509::Cert_key'],
+ Class['Site_config::X509::Key'],
+ Class['Site_config::X509::Cert'],
Class['Site_config::X509::Ca'] ];
}