X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=11ae5c60ecb28de46562412041947113e2d1a1c5;hb=6999e9642097e4dbe2555f1c3abe4bdd19e6bc1b;hp=f0699a9e4cb627061715ad76b7c95ce1376b241c;hpb=69c19f570b0c7668d1374600a5a7cedaa81fbe2d;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f0699a9e4..11ae5c60e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,6 +17,7 @@ node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
     include syslog-ng
@@ -97,10 +98,10 @@ 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 }
+        liszt,widor:                     { include named::recursor }
     }
     case $hostname {
-        ries:   {
+        franck,master,murphy,ries,samosa,spohr:   {
             include unbound
             $runs_local_resolver = true
         }