From e358ef4e33cbf9411d57c11d58657331d7ba8a62 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 14 Mar 2013 18:01:01 +0100
Subject: use custom preferences for couchdb host

---
 puppet/modules/site_apt/manifests/init.pp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_apt/manifests')

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
-- 
cgit v1.2.3