X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3e5e5f312153af9bc5764a539457e84edebd7631;hb=5430090f26c627828a0e8e267be34ff687e76920;hp=8788574f8fe137228d60e7a6e2b5be0ec3934d96;hpb=507251cb409326409c2e13a365ce901796468d68;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 8788574f8..3e5e5f312 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,7 +17,7 @@ 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")
+    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
     $mxinfo    = allnodeinfo("mXRecord")
     notice("hoster for ${fqdn} is ${hoster}")
 
@@ -61,6 +61,10 @@ node default {
         }
     }
 
+    case extractnodeinfo($nodeinfo, 'puppetmaster') {
+        true: { include puppetmaster }
+    }
+
     case extractnodeinfo($nodeinfo, 'muninmaster') {
         true: { include munin-node::master }
     }
@@ -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: