From 5c1575180e9333ccb1af1f0331f540811e8b774b Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 5 Mar 2011 13:24:24 +0100 Subject: [PATCH] Try to get rid of runs_local_resolver var and use unbound fact --- manifests/site.pp | 8 +------- modules/resolv/templates/resolv.conf.erb | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index d043a502..d6153233 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -101,13 +101,7 @@ node default { liszt,widor: { include named::recursor } } case $hostname { - franck,master,murphy,ries,samosa,spohr: { - include unbound - $runs_local_resolver = true - } - default: { - $runs_local_resolver = false - } + franck,master,murphy,ries,samosa,spohr: { include unbound } } case getfromhash($nodeinfo, 'squeeze') { true: { include unbound } diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index 9bc11ba9..ad7ac723 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -21,7 +21,7 @@ searchpaths << "debian.org" resolvconf = '' resolvconf += "search " + searchpaths.join(" ") + "\n" -if runs_local_resolver +if unbound and unbound == "true" resolvconf += "nameserver 127.0.0.1\n" else if nameservers.empty? -- 2.39.2