summaryrefslogtreecommitdiff
path: root/puppet/modules/site_couchdb/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-01-31 17:19:46 +0100
committervarac <varacanero@zeromail.org>2014-01-31 17:19:46 +0100
commit37e3c260f026a66b37f54cd6092ee2c28d262247 (patch)
treef1bca78de1e368b97332356928710257fe3c6a42 /puppet/modules/site_couchdb/manifests
parente94ae94dd01cd256f89fb079cfca75a487dceed5 (diff)
parentca1c07ad510ec24037b9fd4baad1a57b26eabedc (diff)
Merge branch 'develop' into 0.6
Diffstat (limited to 'puppet/modules/site_couchdb/manifests')
-rw-r--r--puppet/modules/site_couchdb/manifests/designs.pp1
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp7
2 files changed, 7 insertions, 1 deletions
diff --git a/puppet/modules/site_couchdb/manifests/designs.pp b/puppet/modules/site_couchdb/manifests/designs.pp
index 2d0a8326..83d6c8cd 100644
--- a/puppet/modules/site_couchdb/manifests/designs.pp
+++ b/puppet/modules/site_couchdb/manifests/designs.pp
@@ -7,6 +7,7 @@ class site_couchdb::designs {
ensure => directory,
source => 'puppet:///modules/site_couchdb/designs',
recurse => true,
+ purge => true,
mode => '0755'
}
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index fd7e67a1..137b661f 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -50,7 +50,12 @@ class site_couchdb {
chttpd_bind_address => '127.0.0.1'
}
- class { 'couchdb::bigcouch::package::cloudant': }
+ # 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']