summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-10-13 11:08:22 +0200
committervarac <varacanero@zeromail.org>2012-10-13 11:08:22 +0200
commit01732be30c06919f85e4887a500f7e9b11e56e4f (patch)
tree424d3e3374096fae6b66c913c59ba82a9e14a714
parent4c5f0726d3eee0caa62f509743762968dc4b544b (diff)
use site_couchdb
-rw-r--r--puppet/manifests/site.pp6
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp11
2 files changed, 10 insertions, 7 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index ef5c3a8a..e0b573ce 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -15,9 +15,7 @@ node 'default' {
include site_config::eip
}
- if 'couchdb' in $services {
- class { 'couchdb':
- #bind => '0.0.0.0'
- }
+ if 'couchdb' in $services {
+ include site_couchdb
}
}
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 4e347567..bb14595a 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -1,6 +1,11 @@
-class site_config::couchdb {
- apt::sources_list { "unstable.list":
- source => [ "puppet:///modules/site_apt/unstable.list"],
+class site_couchdb {
+ apt::sources_list { 'unstable.list':
+ source => [ 'puppet:///modules/site_apt/unstable.list'],
+ }
+
+
+ class { 'couchdb':
+ #bind => '0.0.0.0'
}
}