removed pinning couchdb to unstable because 1.2.0-3 is in wheezy, finally

3 files changed, 3 insertions, 23 deletions

diff --git a/puppet/modules/site_couchdb/manifests/configure.pp b/puppet/modules/site_couchdb/manifests/configure.pp
index 25ea7a0b..333511b5 100644
--- a/puppet/modules/site_couchdb/manifests/configure.pp
+++ b/puppet/modules/site_couchdb/manifests/configure.pp
@@ -1,9 +1,4 @@
 class site_couchdb::configure {
-  Class[site_couchdb::package] -> Class[couchdb]
-
-  class { 'couchdb':
-    require => Class['site_couchdb::package'], }
-
 
   file { '/etc/init.d/couchdb':
     source => 'puppet:///modules/site_couchdb/couchdb',
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 10408094..3f577d8b 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -1,5 +1,7 @@
 class site_couchdb {
 
+  include couchdb
+
   $x509                   = hiera('x509')
   $key                    = $x509['key']
   $cert                   = $x509['cert']
@@ -15,9 +17,7 @@ class site_couchdb {
   $couchdb_ca_daemon_user = $couchdb_ca_daemon['username']
   $couchdb_ca_daemon_pw   = $couchdb_ca_daemon['password']
 
-  Class['site_couchdb::package']
-    -> Exec['refresh_apt']
-    -> Package ['couchdb']
+  Package ['couchdb']
     -> File['/etc/init.d/couchdb']
     -> File['/etc/couchdb/local.ini']
     -> File['/etc/couchdb/local.d/admin.ini']
@@ -28,8 +28,6 @@ class site_couchdb {
     -> Couchdb::Add_user[$couchdb_ca_daemon_user]
     -> Site_couchdb::Apache_ssl_proxy['apache_ssl_proxy']
 
-  # Setup couchdb
-  include site_couchdb::package
   include site_couchdb::configure
   include couchdb::deploy_config
 
diff --git a/puppet/modules/site_couchdb/manifests/package.pp b/puppet/modules/site_couchdb/manifests/package.pp
deleted file mode 100644
index c091316a..00000000
--- a/puppet/modules/site_couchdb/manifests/package.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class site_couchdb::package {
-
-  # 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;
-  }
-}