X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=564d270fc662a5776985b738714fe58baea0fcdf;hb=9b38543fe6545d8e88a2943fdb0a96cfd522faf1;hp=f040683ca4b69dbbcea06111eb9df48c95f6b925;hpb=d7475f90c56697e9589e1386ced135498df68c81;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f040683ca..564d270fc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,10 +17,12 @@ node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $ldapall   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "mXRecord")
+    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber")
+    $mxinfo    = allnodeinfo("mXRecord")
     notice("hoster for ${fqdn} is ${hoster}")
 
     include munin-node
+    include syslog-ng
     include sudo
     include ssh
     include debian-org
@@ -79,8 +81,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 }
     }
 
@@ -106,7 +108,15 @@ 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: