diff options
| author | varac <varacanero@zeromail.org> | 2012-10-13 10:27:20 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-10-13 10:27:20 +0200 |
| commit | 362cb50e73fd86cf1a7c705fdedfd6227cbe5ff3 (patch) | |
| tree | c5bf35269b20f34ee083a4ab0dd19b7fb09e0551 | |
| parent | 26327946f9f414960679f3bab201a6b1385f49c9 (diff) | |
| parent | 903fcec1d18ce1553516dd13919625bdea384fe9 (diff) | |
Merge remote-tracking branch 'remotes/origin/feature/couchdb' into develop
Conflicts:
.gitmodules
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | puppet/manifests/site.pp | 5 | ||||
| m--------- | puppet/modules/couchdb | 0 |
3 files changed, 8 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index c151aaf7..10a21c03 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,3 +31,6 @@ [submodule "puppet/modules/sysctl"] path = puppet/modules/sysctl url = git://github.com/luxflux/puppet-sysctl.git +[submodule "puppet/modules/couchdb"] + path = puppet/modules/couchdb + url = git://code.leap.se/puppet_couchdb 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 |