Merge branch 'feature/couchdb' into develop

Conflicts:
	puppet/modules/site_shorewall/manifests/eip.pp

1 files changed, 13 insertions, 0 deletions

diff --git a/puppet/modules/site_couchdb/manifests/package.pp b/puppet/modules/site_couchdb/manifests/package.pp
new file mode 100644
index 00000000..c091316a
--- /dev/null
+++ b/puppet/modules/site_couchdb/manifests/package.pp
@@ -0,0 +1,13 @@
+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;
+  }
+}