summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeap Admins <admin@leap.se>2012-09-26 16:50:33 +0000
committerLeap Admins <admin@leap.se>2012-09-26 16:50:33 +0000
commit903fcec1d18ce1553516dd13919625bdea384fe9 (patch)
tree1db8860c74544ccaa057b929c35f746b4e982558
parent7f9c8f7dee5a344f226df74becf9c30e69783b55 (diff)
parente6b33a004b38ee4ebe3b31fd715d32669fbe435a (diff)
Restructure branch couchdb
-rw-r--r--.gitmodules3
-rw-r--r--puppet/manifests/site.pp5
m---------puppet/modules/couchdb0
3 files changed, 8 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 8f2fd482..2e4f3f22 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,6 @@
[submodule "puppet/modules/common"]
path = puppet/modules/common
url = git://labs.riseup.net/shared-common
+[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 5f58a733..3b28be2f 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -27,4 +27,9 @@ node 'default' {
create_resources('site_openvpn::server_config', $openvpn_configs)
}
+ 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