diff options
author | Micah Anderson <micah@leap.se> | 2014-04-04 10:37:09 -0400 |
---|---|---|
committer | Micah Anderson <micah@leap.se> | 2014-04-04 10:37:09 -0400 |
commit | 6af957a1c20f75a827655a3cd75e40a03cffe7c4 (patch) | |
tree | e5995b0c4b53583fd9d16857f66f81137dccbf73 /puppet/modules/site_couchdb/manifests/init.pp | |
parent | 7451213d5e0772d0d6cba4613bf66792da495909 (diff) | |
parent | 1551f785c5c7c515781995928eec7659365d8988 (diff) |
Merge branch '0.5' into develop
Conflicts:
provider_base/services/tor.json
Change-Id: I826579945a0d93c43384f0fd12c9833762b084cf
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/init.pp')
-rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 137b661f..c67ce8c8 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -94,6 +94,7 @@ class site_couchdb { include site_couchdb::add_users include site_couchdb::designs include site_couchdb::logrotate + include site_couchdb::bigcouch::compaction include site_shorewall::couchdb include site_shorewall::couchdb::bigcouch @@ -107,4 +108,12 @@ class site_couchdb { } if $couchdb_backup { include site_couchdb::backup } + + include site_check_mk::agent::couchdb + include site_check_mk::agent::tapicero + + file { '/var/log/bigcouch': + ensure => directory + } + } |