diff options
author | elijah <elijah@riseup.net> | 2016-02-01 15:56:41 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2016-02-23 09:50:58 -0800 |
commit | da2c743faaccd26604c4c26fbb1557934688eb4a (patch) | |
tree | bda43f9cb86d736183d4db8929b455a03ca77c0b /puppet/modules/site_couchdb/manifests/init.pp | |
parent | 685642e8bfdaff16a4f02bd40b5d2aef15b68d94 (diff) |
default to plain couchdb, unless otherwise specified.
# Conflicts:
# puppet/modules/site_couchdb/manifests/plain.pp
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/init.pp')
-rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 8d79ae75..0c126f0c 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -41,8 +41,8 @@ class site_couchdb { $couchdb_pwhash_alg = $couchdb_config['pwhash_alg'] if $couchdb_mode == 'multimaster' { include site_couchdb::bigcouch } - if $couchdb_mode == 'master' { include site_couchdb::master } - if $couchdb_mode == 'mirror' { include site_couchdb::mirror } + if $couchdb_mode == 'plain' { include site_couchdb::plain } + # if $couchdb_mode == 'mirror' { include site_couchdb::mirror } Class['site_config::default'] -> Service['shorewall'] |