summaryrefslogtreecommitdiff
path: root/puppet/modules/site_couchdb
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-01-21 14:41:04 +0100
committervarac <varacanero@zeromail.org>2014-01-21 14:41:04 +0100
commite91d7e016244da48be0a9ea23d3bb43bb3b8e93d (patch)
treeef6114d92ce9e6609e63e530dd67aa688812ea78 /puppet/modules/site_couchdb
parent0e07e1b20acb844a6c610166c9918a92a093df73 (diff)
properly purge cloudant repository leftovers (#4971)
Diffstat (limited to 'puppet/modules/site_couchdb')
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index e1414b34..4cd7ce03 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -49,8 +49,15 @@ class site_couchdb {
ednp_port => $ednp_port
}
+ # ensure that we don't have leftovers from previous installations
+ # where we installed the cloudant bigcouch package
+ # https://leap.se/code/issues/4971
+ class { 'couchdb::bigcouch::package::cloudant':
+ ensure => absent
+ }
Class['site_config::default']
+ -> Class['couchdb::bigcouch::package::cloudant']
-> Service['couchdb']
-> Class['site_couchdb::stunnel']
-> File['/root/.netrc']