X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=6b6b43e2b677e2e81d8d09333daec8a384dde316;hb=f70c7c4d85fd0ef28fbfd93cca4011d4e6f033a8;hp=920ebfa77ec441ffed3bda5a17c69ef88a88ff1e;hpb=fbdfced4d644a867a1913ff13e94fb6851bb8442;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 920ebfa77..6b6b43e2b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,10 +16,8 @@ Exec {
 node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $allnodeinfo = allnodeinfo(["sshRSAHostKey", "ipHostNumber"], ["purpose"])
-    $mxinfo    = allnodeinfo("mXRecord")
-    notice("hoster for ${fqdn} is ${hosterinfo}")
+    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
     include syslog-ng
@@ -98,23 +96,17 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff,draghi: { include named::authoritative }
-        geo1,geo2,geo3:                  { include named::geodns }
-        franck,liszt,master,samosa,spohr,widor:   { include named::recursor }
+        klecker,ravel,senfl,orff,draghi,diamond: { include named::authoritative }
+        geo1,geo2,geo3:                          { include named::geodns }
+        liszt:                                   { include named::recursor }
     }
     case $hostname {
-        ries:   {
-            include unbound
-            $runs_local_resolver = true
-        }
-        default: {
-            $runs_local_resolver = false
-        }
+        franck,master,lobos,samosa,spohr,widor:   { include unbound }
     }
-    case getfromhash($hosterinfo, 'nameservers') {
-        false:      {}
-        default:    { include resolv }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
     }
+    include resolv
 
     case $kernel {
         Linux: {
@@ -127,7 +119,7 @@ node default {
     }
 
     case $hostname {
-        beethoven,ravel,spohr,stabile: {
+        beethoven,duarte,ravel,spohr,stabile: {
             include nfs-server
         }
     }
@@ -159,7 +151,12 @@ node default {
         chopin,geo3,soler,wieck: {
             include debian-radvd
         }
-   }
+    }
+
+    case $kernel {
+        Linux: { include entropykey }
+    }
+
 }
 
 # vim:set et: