X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=5eb7926e67e1370d703558cbc2b0d1522d7dc699;hb=848287c0ca9cd4531cf24def93f4220d54e7b245;hp=fe2b8702b121344a5af0fc1e327d6418b3952e79;hpb=722e609c395d98b8b67f09c7da9df4c3d0890701;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index fe2b8702b..5eb7926e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,10 +18,9 @@ node default {
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
     $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber")
+    $mxinfo    = allnodeinfo("mXRecord")
     notice("hoster for ${fqdn} is ${hoster}")
 
-    $mxinfo   = allnodeinfo("mXRecord")
-
     include munin-node
     include sudo
     include ssh
@@ -81,8 +80,8 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff: { include named::secondary }
-        geo1,geo2,geo3:           { include named::geodns }
+        klecker,ravel,senfl,orff,draghi: { include named::authoritative }
+        geo1,geo2,geo3:                  { include named::geodns }
         bartok,franck,liszt,master,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
@@ -108,7 +107,15 @@ node default {
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
+
     include samhain
+
+    case $hostname {
+        byrd,schuetz,draghi,lamb,locke:    { include krb }
+    }
+    case $hostname {
+        lamb,locke:    { include afs::server }
+    }
 }
 
 # vim:set et: