summaryrefslogtreecommitdiff
path: root/puppet/modules/site_couchdb/manifests/init.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-10-30 16:01:41 +0100
committervarac <varacanero@zeromail.org>2012-10-30 16:01:41 +0100
commit69ba8553f483d99782775e8ed5ab01cd45a75e72 (patch)
tree7940602b6f68380ea98c207425ba6563d445fb73 /puppet/modules/site_couchdb/manifests/init.pp
parent641d9f15ad12c3f580cf27c3fe4ee6dd16462f22 (diff)
configure unstable pinning for couchdb before install
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/init.pp')
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp15
1 files changed, 1 insertions, 14 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 06c29181..a9e6343a 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -1,18 +1,5 @@
class site_couchdb {
- # for now, we need to install couchdb from unstable,
- # because of this bug while installing:
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681549
- # can be removed when couchdb/1.2.0-2 is integrated into testing
- apt::sources_list { 'unstable.list':
- source => [ 'puppet:///modules/site_apt/unstable.list'],
- }
- apt::preferences_snippet{
- 'couchdb': release => "unstable", priority => 999;
- }
-
- class { 'couchdb':
- #bind => '0.0.0.0'
- }
+ class {'site_couchdb::package':} -> class {'site_couchdb::configure':}
}