]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Try setting a var
authorPeter Palfrader <peter@palfrader.org>
Tue, 1 Mar 2011 22:02:26 +0000 (23:02 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 1 Mar 2011 22:02:26 +0000 (23:02 +0100)
manifests/site.pp
modules/resolv/templates/resolv.conf.erb

index 482cc6ba56dca51542d1db1d28fce0c888ea06f9..163adde0d509ce386c977bd4622c0e0f68973a6f 100644 (file)
@@ -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:      {}
index 99d8c0a64bc27e91b49c32e03eb87fea78110da8..4e9f7650c588e0c184acbea08ad07c1cc2258f2d 100644 (file)
@@ -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