X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=fb85a46d4d4701c5c1a1f61740f473f431653e2a;hb=5e44ff243547aa2036db0cc1af549f4b9523e6b4;hp=33b114927f6029b589b08a7e50d6974be99880e9;hpb=47968951268439eb72ff714afdb51385e900b4cd;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 33b114927..fb85a46d4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,6 +21,7 @@ node default {
 
     $mxinfo   = allnodeinfo("mXRecord")
 
+    include ferm
     include munin-node
     include sudo
     include ssh
@@ -50,6 +51,11 @@ node default {
 
     case $hostname {
         spohr: {
+                      include munin-node::master
+        }
+    }
+    case $hostname {
+        tchaikovsky: {
                       include nagios::server
         }
         default: {
@@ -71,9 +77,12 @@ node default {
     }
 
     case $hostname {
-        rietz,raff,klecker: { include named::secondary }
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
+    case $hostname {
+        logtest01: { include ferm::real }
+    }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }
     }
@@ -81,6 +90,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }