From 2e8e944225660df69ce7767e9374995c35c4d748 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 1 Mar 2011 23:02:26 +0100 Subject: [PATCH] Try setting a var --- manifests/site.pp | 8 +++++++- modules/resolv/templates/resolv.conf.erb | 10 ++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 482cc6ba..163adde0 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -103,7 +103,13 @@ node default { franck,liszt,master,samosa,spohr,widor: { include named::recursor } } case $hostname { - ries: { include unbound } + ries: { + include unbound + $runs_local_resolver = true + } + default: { + $runs_local_resolver = false + } } case getfromhash($hosterinfo, 'nameservers') { false: {} diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb index 99d8c0a6..4e9f7650 100644 --- a/modules/resolv/templates/resolv.conf.erb +++ b/modules/resolv/templates/resolv.conf.erb @@ -24,9 +24,15 @@ end resolvconf = '' resolvconf += "search " + searchpaths.join(" ") + "\n" -nameservers.each do |ns| - resolvconf += "nameserver " + ns + "\n" + +if runs_local_resolver + resolvconf += "nameserver 127.0.0.1\n" +else + nameservers.each do |ns| + resolvconf += "nameserver " + ns + "\n" + end end + options.each do |opt| resolvconf += "options " + opt + "\n" end -- 2.39.2