diff options
author | varac <varacanero@zeromail.org> | 2015-06-22 11:10:22 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-06-22 11:10:22 +0200 |
commit | a69732be70335ac3ca86b476d9a9679494904845 (patch) | |
tree | f05ecf466d48127e026750cf955a8450172c5910 /puppet/modules/site_couchdb/manifests/master.pp | |
parent | 9cb2393ce0d83359aee25500af8280d40de029ff (diff) | |
parent | c2337647f3def5b3b3cd55b5ceaf649299bb7874 (diff) |
Merge branch 'use_pbkdf2_for_newer_couchdb_versions' into develop
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/master.pp')
-rw-r--r-- | puppet/modules/site_couchdb/manifests/master.pp | 8 |
1 files changed, 4 insertions, 4 deletions
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 +} |