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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8788574f8..f5dd399f0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -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: