allow zivit to monitor their machines

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9020a4ce9f5c1891658dc3e395877fea61d074d5..9518633d9110a2e40323a588130ccefb59626174 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -74,19 +74,38 @@ node default {
     }
 
     case extractnodeinfo($nodeinfo, 'buildd') {
-         true:  { include buildd }
+         'true':  {
+             include buildd
+             case $kernel {
+                 Linux: {
+                     include ferm
+                 }
+             }
+         }
     }
 
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok:                   { include named::recursor }
+        bartok,schein,steffani:   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck: { include ferm }
+        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky: { include ferm }
     }
     case $hostname {
+        zandonai,zelenka: {
+           @ferm::rule { "dsa-zivit-rrdcollect":
+               description  => "port 6666 for rrdcollect for zivit",
+               rule         => "&SERVICE_RANGE(tcp, 6666, ( 10.130.18.71 ))"
+           }
+        }
+        zandonai,zelenka: {
+           @ferm::rule { "dsa-zivit-zabbix":
+               description  => "port 10050 for zabbix for zivit",
+               rule         => "&SERVICE_RANGE(tcp, 10050, ( 10.130.18.76 ))"
+           }
+        }
         piatti: {
            @ferm::rule { "dsa-udd-stunnel":
                description  => "port 8080 for udd stunnel",
@@ -100,7 +119,7 @@ node default {
                    rule            => "&SERVICE(tcp, 873)"
           }
         }
-        saens,villa,lobos,raff,gluck: {
+        saens,villa,lobos,raff,gluck,schein,wieck,steffani: {
            @ferm::rule { "dsa-ftp":
                    domain          => "(ip ip6)",
                    description     => "Allow ftp access",
@@ -112,6 +131,23 @@ node default {
                    rule            => "&SERVICE(tcp, 873)"
           }
         }
+        ancina,zelenka: {
+          @ferm::rule { "dsa-time":
+                   description     => "Allow time access",
+                   rule            => "&SERVICE_RANGE(tcp, time, \$HOST_NAGIOS_V4)"
+          }
+        }
+        handel: {
+          @ferm::rule { "dsa-puppet":
+                   description     => "Allow puppet access",
+                   rule            => "&SERVICE_RANGE(tcp, 8140, \$HOST_DEBIAN_V4)"
+          }
+          @ferm::rule { "dsa-puppet-v6":
+                   domain          => 'ip6',
+                   description     => "Allow puppet access",
+                   rule            => "&SERVICE_RANGE(tcp, 8140, \$HOST_DEBIAN_V6)"
+          }
+        }
 
     }
     case $brokenhosts {