summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-14 18:01:01 +0100
committervarac <varacanero@zeromail.org>2013-03-14 18:01:01 +0100
commite358ef4e33cbf9411d57c11d58657331d7ba8a62 (patch)
tree64eb7b7663bf9543e4ce94255d54177cd64d6bde /puppet
parentc13bbca2cbf1c458aae32460e758d5e7d8a46183 (diff)
use custom preferences for couchdb host
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/manifests/init.pp11
1 files changed, 9 insertions, 2 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index 1f8456b2..f420b0cc 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -1,6 +1,13 @@
-class site_apt {
+class site_apt {
- include ::apt
+ # on couchdb we need to include squeeze in apt preferences,
+ # so the cloudant package can pull some packages from squeeze
+ if 'couchdb' in $::services {
+ $custom_preferences = 'site_apt/preferences.include_squeeze'
+ } else {
+ $custom_preferences = ''
+ }
+ class {'apt': custom_preferences => $custom_preferences }
# enable http://deb.leap.se debian package repository
include site_apt::leap_repo