X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=22e773d18102343fc990f56d8cc8bc1b067b352b;hb=5225ae8b10af48b44141003688115c10d5f969a1;hp=c9afa69bf21540f48eaa4122333c6d8a04550b44;hpb=86b076a671944fa76ee3fe291be16a93982798e0;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index c9afa69bf..22e773d18 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,25 +80,20 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff: { include named::secondary }
-        geo1,geo2,geo3:           { include named::geodns }
-        bartok,franck,liszt,master,ries,samosa,schein,spohr,steffani:   { include named::recursor }
+        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 }
     }
 
-    case $hostname {
-        cilea,luchesi,merikanto,paganini,rautavaara,sibelius: {}
-        default: {
-             case $kernel {
-                 Linux: {
-                     include ferm
-                 }
-             }
-         }
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+        }
     }
-    include ferm::per-host
 
     case $hostname {
-        ravel,spohr: {
+        beethoven,ravel,spohr: {
             include nfs-server
         }
     }
@@ -113,5 +107,17 @@ node default {
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
+
     include samhain
+
+    case $hostname {
+        byrd,schuetz,draghi,lamb,locke,rautavaara:    { include krb }
+    }
+    case $hostname {
+        lamb,locke,rautavaara:    { include afs::server }
+    }
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: