From: Martin Zobel-Helas Date: Sun, 23 Jan 2011 21:10:38 +0000 (+0100) Subject: samhain ignore /etc/dupload.conf on buildds X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=dcfe12cf33c184758eb0a43ccdb5755e60ffcd27 samhain ignore /etc/dupload.conf on buildds Signed-off-by: Martin Zobel-Helas --- diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index d9c46b43..d248d115 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