summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-06-11 20:07:01 +0200
committervarac <varacanero@zeromail.org>2015-06-11 22:33:02 +0200
commitc2337647f3def5b3b3cd55b5ceaf649299bb7874 (patch)
tree55038f57942f3eb173fb69823ee6da31b7be1e19 /puppet
parent596277daf9c4db0ced8fdbbda930078f033e0855 (diff)
use couch.pwhash_alg hiera variable for hashing couchdb admin pw
use this to run a single, plain couchdb node, using couchdb 1.6 from the leap repo: "couch": { "master": true, "pwhash_alg": "pbkdf2" } Change-Id: Ie4f34c2c5cb9feca7a10450bcf0bc260c8aa9d33
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp3
-rw-r--r--puppet/modules/site_couchdb/manifests/master.pp8
2 files changed, 7 insertions, 4 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index a11f6309..6b6ddd3a 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -1,3 +1,5 @@
+# entry class for configuring couchdb/bigcouch node
+# couchdb node
class site_couchdb {
tag 'leap_service'
@@ -41,6 +43,7 @@ class site_couchdb {
$couchdb_backup = $couchdb_config['backup']
$couchdb_mode = $couchdb_config['mode']
+ $couchdb_pwhash_alg = $couchdb_config['pwhash_alg']
if $couchdb_mode == 'multimaster' { include site_couchdb::bigcouch }
if $couchdb_mode == 'master' { include site_couchdb::master }
diff --git a/puppet/modules/site_couchdb/manifests/master.pp b/puppet/modules/site_couchdb/manifests/master.pp
index a0a6633d..c28eee7d 100644
--- a/puppet/modules/site_couchdb/manifests/master.pp
+++ b/puppet/modules/site_couchdb/manifests/master.pp
@@ -1,9 +1,9 @@
+# this class sets up a single, plain couchdb node
class site_couchdb::master {
-
class { 'couchdb':
admin_pw => $site_couchdb::couchdb_admin_pw,
admin_salt => $site_couchdb::couchdb_admin_salt,
- chttpd_bind_address => '127.0.0.1'
+ chttpd_bind_address => '127.0.0.1',
+ pwhash_alg => $site_couchdb::couchdb_pwhash_alg
}
-
-} \ No newline at end of file
+}