From f7cd516218ccfb5ec1a68f9953dfce6be605b25b Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 24 Sep 2012 21:28:36 +0200 Subject: added submodule couchdb --- .gitmodules | 3 +++ puppet/modules/couchdb | 1 + 2 files changed, 4 insertions(+) create mode 160000 puppet/modules/couchdb diff --git a/.gitmodules b/.gitmodules index 8f2fd482..33064a2c 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://github.com/Benjamin-Ds/puppet-module-couchdb.git diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb new file mode 160000 index 00000000..a8052f92 --- /dev/null +++ b/puppet/modules/couchdb @@ -0,0 +1 @@ +Subproject commit a8052f92424ea020250265d89f5bc8df02104c7e -- cgit v1.2.3 From 8c078cbe1c607e0cb2df917196c00eade55b3a01 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 24 Sep 2012 22:20:57 +0200 Subject: test class couchdb --- puppet/manifests/site.pp | 5 +++++ 1 file changed, 5 insertions(+) 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' + } + } } -- cgit v1.2.3 From 97979201818f8f830dba2f001cfb5c8bce3822ed Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 24 Sep 2012 22:56:56 +0200 Subject: deleted submodule couchdb (from Benjamin-D) --- .gitmodules | 3 --- puppet/modules/couchdb | 1 - 2 files changed, 4 deletions(-) delete mode 160000 puppet/modules/couchdb diff --git a/.gitmodules b/.gitmodules index 33064a2c..8f2fd482 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,6 +22,3 @@ [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://github.com/Benjamin-Ds/puppet-module-couchdb.git diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb deleted file mode 160000 index a8052f92..00000000 --- a/puppet/modules/couchdb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a8052f92424ea020250265d89f5bc8df02104c7e -- cgit v1.2.3 From 5486456528dd074b5ce705d23fab1da625043992 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 24 Sep 2012 23:48:00 +0200 Subject: added camptocamp's submodule couchdb --- .gitmodules | 3 +++ puppet/modules/couchdb | 1 + 2 files changed, 4 insertions(+) create mode 160000 puppet/modules/couchdb diff --git a/.gitmodules b/.gitmodules index 8f2fd482..7dabc497 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://github.com/camptocamp/puppet-couchdb.git diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb new file mode 160000 index 00000000..e97e4081 --- /dev/null +++ b/puppet/modules/couchdb @@ -0,0 +1 @@ +Subproject commit e97e408116525f28b53162b89e6b582fb71020d2 -- cgit v1.2.3 From e6b33a004b38ee4ebe3b31fd715d32669fbe435a Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 25 Sep 2012 09:57:10 +0200 Subject: use leap's puppet_couchdb --- .gitmodules | 2 +- puppet/modules/couchdb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7dabc497..2e4f3f22 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,4 +24,4 @@ url = git://labs.riseup.net/shared-common [submodule "puppet/modules/couchdb"] path = puppet/modules/couchdb - url = git://github.com/camptocamp/puppet-couchdb.git + url = git://code.leap.se/puppet_couchdb diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb index e97e4081..8daa8625 160000 --- a/puppet/modules/couchdb +++ b/puppet/modules/couchdb @@ -1 +1 @@ -Subproject commit e97e408116525f28b53162b89e6b582fb71020d2 +Subproject commit 8daa862541facd5207a75760f3656e857faf73fd -- cgit v1.2.3