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 fe2b8702b121344a5af0fc1e327d6418b3952e79..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