From 45516931d3de1d72ae32e18414336a04bc1e7e48 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 4 Apr 2011 08:06:41 +0100 Subject: [PATCH] we handle unbound.conf with puppet - please to ignore Signed-off-by: Stephen Gran --- modules/samhain/templates/samhainrc.erb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 820dbdbae..600c05edf 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -147,7 +147,9 @@ file=/etc/ferm/ file=/etc/ferm/conf.d file=/etc/ferm/dsa.d file=/etc/rc.local - +<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %> +file=/etc/unbound +<% end -%> [LogFiles] ## @@ -386,7 +388,6 @@ file=/etc/bind/named.conf.debian-zones <% if fqdn == "dijkstra.debian.org" -%> dir=4/etc/dsa-kvm <% end -%> - <% if nodeinfo['buildd'] -%> dir=3/etc/lvm <% end -%> @@ -395,6 +396,9 @@ file=/etc/ferm/conf.d/me.conf file=/etc/ferm/conf.d/defs.conf file=/etc/ferm/ferm.conf dir=2/etc/ssl/debian +<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %> +file=/etc/unbound/unbound.conf +<% end -%> [IgnoreNone] ## -- 2.20.1