We use "keyinfo" in all kinda of places. Rename it to something more generic

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 331c789f2c179fe42a4b15f0553070830fc5a7ce..f040683ca4b69dbbcea06111eb9df48c95f6b925 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,11 +17,9 @@ 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")
-    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber")
+    $ldapall   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "mXRecord")
     notice("hoster for ${fqdn} is ${hoster}")
 
-    $mxinfo   = allnodeinfo("mXRecord")
-
     include munin-node
     include sudo
     include ssh
@@ -83,20 +81,21 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok,schein,steffani,ries,franck,liszt,master,spohr:   { include named::recursor }
+        bartok,franck,liszt,master,samosa,schein,spohr,steffani:   { include named::recursor }
+    }
+
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+        }
     }
 
     case $hostname {
-        cilea,luchesi,merikanto,ravel,paganini,rautavaara,sibelius,spohr: {}
-        default: {
-             case $kernel {
-                 Linux: {
-                     include ferm
-                 }
-             }
-         }
+        beethoven,ravel,spohr: {
+            include nfs-server
+        }
     }
-    include ferm::per-host
 
     case $brokenhosts {
         "true":    { include hosts }
@@ -109,3 +108,7 @@ node default {
     }
     include samhain
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: