summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-10-13 10:27:20 +0200
committervarac <varacanero@zeromail.org>2012-10-13 10:27:20 +0200
commit362cb50e73fd86cf1a7c705fdedfd6227cbe5ff3 (patch)
treec5bf35269b20f34ee083a4ab0dd19b7fb09e0551 /puppet
parent26327946f9f414960679f3bab201a6b1385f49c9 (diff)
parent903fcec1d18ce1553516dd13919625bdea384fe9 (diff)
Merge remote-tracking branch 'remotes/origin/feature/couchdb' into develop
Conflicts: .gitmodules
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/site.pp5
m---------puppet/modules/couchdb0
2 files changed, 5 insertions, 0 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index d451bdf5..ef5c3a8a 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -15,4 +15,9 @@ node 'default' {
include site_config::eip
}
+ if 'couchdb' in $services {
+ class { 'couchdb':
+ #bind => '0.0.0.0'
+ }
+ }
}
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
new file mode 160000
+Subproject 8daa862541facd5207a75760f3656e857faf73f