From 69ba8553f483d99782775e8ed5ab01cd45a75e72 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 30 Oct 2012 16:01:41 +0100 Subject: configure unstable pinning for couchdb before install --- puppet/modules/site_couchdb/manifests/init.pp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'puppet/modules/site_couchdb/manifests/init.pp') 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':} } -- cgit v1.2.3