X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=895a84dd1f2d7c31165e7b1bec6990a8fe684d0f;hb=a07d3c87c702f358bd36d52f423c1f437307b015;hp=8788574f8fe137228d60e7a6e2b5be0ec3934d96;hpb=507251cb409326409c2e13a365ce901796468d68;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 8788574f..895a84dd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,10 +16,10 @@ Exec {
 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")
+    $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
     $mxinfo    = allnodeinfo("mXRecord")
-    notice("hoster for ${fqdn} is ${hoster}")
+    notice("hoster for ${fqdn} is ${getfromhash(hosterinfo, "name")}")
 
     include munin-node
     include syslog-ng
@@ -61,6 +61,10 @@ node default {
         }
     }
 
+    case extractnodeinfo($nodeinfo, 'puppetmaster') {
+        true: { include puppetmaster }
+    }
+
     case extractnodeinfo($nodeinfo, 'muninmaster') {
         true: { include munin-node::master }
     }
@@ -118,7 +122,7 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case $hoster {
+    case getfromhash($hosterinfo, "name") {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
     case $portforwarder_user_exists {
@@ -131,7 +135,7 @@ node default {
         byrd,schuetz,tchaikovsky: {
             include krb
         }
-        draghi,quantz,samosa: {
+        draghi,quantz: {
             include krb
             include afs
         }
@@ -140,6 +144,12 @@ node default {
             include afs::server
         }
     }
+
+    case $hostname {
+        chopin,geo3,soler,wieck: {
+            include debian-radvd
+        }
+   }
 }
 
 # vim:set et: