summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-02-26 01:44:48 -0800
committerelijah <elijah@riseup.net>2016-02-26 01:44:48 -0800
commit89a3cd71f50a383a5f85510193087446da0e661f (patch)
treea49de8e4d2b2b937d37f1a5268ce05291203a54d /puppet/modules
parentef92ef66f61559b3fa2ea5a63a158e49573282dd (diff)
plain couchdb now required, bigcouch support disabled.
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp9
1 files changed, 6 insertions, 3 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 0c282e1c..3f670ed2 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -40,10 +40,13 @@ class site_couchdb {
$couchdb_mode = $couchdb_config['mode']
$couchdb_pwhash_alg = $couchdb_config['pwhash_alg']
- if $couchdb_mode == 'multimaster' { include site_couchdb::bigcouch }
- if $couchdb_mode =~ /^(plain|master)$/ { include site_couchdb::plain }
+ # ensure bigcouch has been purged from the system:
+ # TODO: remove this check in 0.9 release
+ if file('/opt/bigcouch/bin/bigcouch', '/dev/null') != '' {
+ fail 'ERROR: BigCouch appears to be installed. Make sure you have migrated to CouchDB before proceeding. See https://leap.se/upgrade-0-8'
+ }
- # if $couchdb_mode == 'mirror' { include site_couchdb::mirror }
+ include site_couchdb::plain
Class['site_config::default']
-> Service['shorewall']