diff options
author | varac <varacanero@zeromail.org> | 2012-11-06 11:09:45 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2012-11-06 11:09:45 +0100 |
commit | 1493ca871a596380f3db6feeb2c0621a597d4f30 (patch) | |
tree | ae5dda6dba81b77ca159cd1aa9e0bb32a13a3da7 /puppet/modules/site_couchdb/manifests/package.pp | |
parent | e6d9dca1e6c695e52f5052cb6877787e13bb0fb2 (diff) | |
parent | 7ca4f22e4cd76d986fece61674f487809d1369c6 (diff) |
Merge branch 'feature/couchdb' into develop
Conflicts:
puppet/modules/site_shorewall/manifests/eip.pp
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/package.pp')
-rw-r--r-- | puppet/modules/site_couchdb/manifests/package.pp | 13 |
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; + } +} |