From 199a9b1ad0770295422ed9001b94ac9e1670655d Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Fri, 6 Jan 2012 17:53:55 +0000 Subject: [PATCH] add a preferences file for buildd/schroot Signed-off-by: Stephen Gran --- modules/buildd/files/apt-preferences | 7 +++++++ modules/buildd/manifests/init.pp | 4 ++++ modules/samhain/templates/samhainrc.erb | 2 ++ 3 files changed, 13 insertions(+) create mode 100644 modules/buildd/files/apt-preferences diff --git a/modules/buildd/files/apt-preferences b/modules/buildd/files/apt-preferences new file mode 100644 index 000000000..db8dd1fce --- /dev/null +++ b/modules/buildd/files/apt-preferences @@ -0,0 +1,7 @@ +Package: schroot +Pin: release o=buildd.debian.org +Pin-Priority: 500 + +Package: schroot-common +Pin: release o=buildd.debian.org +Pin-Priority: 500 diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index a5af7bedf..1dcc91ceb 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -10,6 +10,10 @@ class buildd { } file { + "/etc/apt/preferences.d/buildd": + source => "puppet:///modules/buildd/apt-preferences", + ; + "/etc/apt/sources.list.d/buildd.list": content => template("buildd/etc/apt/sources.list.d/buildd.list.erb"), require => Package["apt-transport-https"], diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index c2b785776..9515fb20b 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -125,6 +125,7 @@ file=/etc/exim4/ssl file=/etc/apt file=/etc/apt/apt.conf.d file=/etc/apt/sources.list.d +file=/etc/apt/preferences.d file=/etc/default file=/etc/logrotate.d file=/etc/nagios @@ -326,6 +327,7 @@ file=/etc/apt/sources.list.d/backports.org.list file=/etc/apt/apt.conf.d/local-compression file=/etc/apt/apt.conf.d/local-recommends file=/etc/apt/apt.conf.d/local-pdiffs +file=/etc/apt/preferences.d/buildd file=/etc/puppet/puppet.conf file=/etc/default/puppet file=/etc/default/postgrey -- 2.20.1