X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=a44821f37898740d05b2852bd27297c92aa99bce;hb=3161cb2b71f606f6384c7dfe44674f8f27ed1b19;hp=6c7ec54d0b71ebd5c4222578c8b3ab940357e292;hpb=cd35ce7452af1fd2d5ca2bd8564102f099fe37cb;p=mirror%2Fdsa-puppet.git diff --git a/manifests/site.pp b/manifests/site.pp index 6c7ec54d0..a44821f37 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -16,7 +16,7 @@ Exec { node default { $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml") $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml") - $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord") + $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord physicalHost purpose") notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) ) include munin-node @@ -121,6 +121,9 @@ node default { case getfromhash($nodeinfo, 'squeeze') { true: { include unbound } } + case getfromhash($nodeinfo, 'wheezy') { + true: { include unbound } + } include resolv case $kernel {