diff options
| author | elijah <elijah@riseup.net> | 2016-02-26 01:45:07 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-02-26 01:45:07 -0800 |
| commit | 15ca782e3bcd22f131c2b8745d7fad118b4b8648 (patch) | |
| tree | ab04c576d6024e2fce1490d00c86c4ba0ecced8e /puppet/modules/site_couchdb/manifests | |
| parent | 89a3cd71f50a383a5f85510193087446da0e661f (diff) | |
| parent | 0206d426bd51aa4805915f6e23b53d5fdb40d738 (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_couchdb/manifests')
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 1 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/plain.pp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 3f670ed2..c4fe6277 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -38,7 +38,6 @@ class site_couchdb { $couchdb_backup = $couchdb_config['backup'] $couchdb_mode = $couchdb_config['mode'] - $couchdb_pwhash_alg = $couchdb_config['pwhash_alg'] # ensure bigcouch has been purged from the system: # TODO: remove this check in 0.9 release diff --git a/puppet/modules/site_couchdb/manifests/plain.pp b/puppet/modules/site_couchdb/manifests/plain.pp index 9338e56a..b40fc100 100644 --- a/puppet/modules/site_couchdb/manifests/plain.pp +++ b/puppet/modules/site_couchdb/manifests/plain.pp @@ -3,8 +3,7 @@ class site_couchdb::plain { class { 'couchdb': admin_pw => $site_couchdb::couchdb_admin_pw, admin_salt => $site_couchdb::couchdb_admin_salt, - chttpd_bind_address => '127.0.0.1', - pwhash_alg => 'pbkdf2' + chttpd_bind_address => '127.0.0.1' } include site_check_mk::agent::couchdb::plain |