put my home subnets in, instead of single ips

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index aa4f69c..fb85a46 100644 (file)
--- 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,9 +51,13 @@ node default {
 
     case $hostname {
         spohr: {
-                      include nagios::server
                       include munin-node::master
         }
+    }
+    case $hostname {
+        tchaikovsky: {
+                      include nagios::server
+        }
         default: {
                      include nagios::client
        }
@@ -72,9 +77,12 @@ node default {
     }
 
     case $hostname {
-        rietz,klecker,ravel,senfl,orff: { include named::secondary }
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
+    case $hostname {
+        logtest01: { include ferm::real }
+    }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }
     }