Try to get rid of runs_local_resolver var and use unbound fact

diff --git a/manifests/site.pp b/manifests/site.pp
index d043a502ce392e8da264c1fc03782a2a088d9799..d61532336bbc0e9c752ed2fb7edb3c6a0b9b7aaa 100644 (file)
--- 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 9bc11ba9664e90a63b189e5d328aad840e14ce15..ad7ac72381c2f8fdcde9894da4cc0fc5b75592e9 100644 (file)
--- 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?