From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 5 Dec 2014 15:40:07 +0000 (+0100)
Subject: Ignore some schroot files
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1821dd249668dfe13c4eff3d68f6eaa42dda72e5;p=mirror%2Fdsa-puppet.git

Ignore some schroot files
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index c7c827874..9ba82ada5 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -155,6 +155,7 @@ file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/schroot/default
+file=/etc/schroot/setup.d
 file=/etc/sysctl.d
 file=/etc/syslog-ng
 file=/etc/stunnel
@@ -414,6 +415,8 @@ file=/etc/cron.d/dsa-buildd
 file=/etc/cron.weekly/stunnel-ekey-restart
 file=/etc/default/schroot
 file=/etc/schroot/default/nssdatabases
+file=/etc/schroot/setup.d/99porterbox-extra-sources
+file=/etc/schroot/setup.d/99porterbox-extra-apt-options
 file=/etc/openvswitch/conf.db
 
 <% if scope.function_has_role(['nagiosmaster']) -%>