Revert "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 d4f7b84a76bd80f2d1a3829fe8e106df24e2fdd5..9b00836e81689755a8ede2c41cc278597c292265 100644 (file)
--- 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
@@ -83,7 +82,7 @@ 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 }
+        bartok,franck,liszt,master,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
     case $kernel {