From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 23 Jan 2011 21:10:38 +0000 (+0100)
Subject: samhain ignore /etc/dupload.conf on buildds
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dcfe12cf33c184758eb0a43ccdb5755e60ffcd27;hp=26681003e861af2467db5d98f45afad3050e5791;p=mirror%2Fdsa-puppet.git

samhain ignore /etc/dupload.conf on buildds

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index d9c46b439..d248d1157 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -215,6 +215,9 @@ file=/var/log/syslog
 <% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%>
 file=/etc/resolv.conf
 <% end -%>
+<% if nodeinfo['buildd'] -%>
+file=/etc/dupload.conf
+<% end -%>
 file=/etc/resolv.conf.pcmcia.save
 file=/etc/nologin
 file=/etc/postfix/debian.db