From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 1 Mar 2011 22:02:26 +0000 (+0100)
Subject: Try setting a var
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2e8e944225660df69ce7767e9374995c35c4d748;hp=3b2bc9d44835cbec74475b2aacf823e328b874d2;p=dsa-puppet.git

Try setting a var
---

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