summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-11-01 10:09:37 +0100
committervarac <varacanero@zeromail.org>2012-11-01 10:09:37 +0100
commit9f7a64ab2813e2c475a776efff4ad9a380ca6cc1 (patch)
tree5bfbde8200c8c8e282669814fef79437baf0ea4d /puppet
parent60c9f0ed9cb957efcbd9972512f5a17a5d828651 (diff)
deploy ssl cert working
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp10
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 8865bde8..f1cca46f 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -1,11 +1,19 @@
class site_couchdb {
+ $couchdb_config = hiera('couchdb')
+ $key = $couchdb_config['key']
+ $cert = $couchdb_config['crt']
+
# install couchdb package first, then configure it
Class['site_couchdb::package'] -> Class['site_couchdb::configure']
include site_couchdb::package
include site_couchdb::configure
- include couchdb::ssl::deploy_certs
+
+ couchdb::ssl::deploy_cert { 'cert':
+ key => $key,
+ cert => $cert,
+ }
include couchdb::deploy_config
}