X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=03d6a14056c889e63bb713f26cce1a3fd80f0f6a;hb=30519f381f59099586b26f96fe1e1bc2497d1511;hp=1a121b49dfc0dc19045b12c45b76e49dc22a8e6b;hpb=2a3c519f08fd98199d230a7619943851cc990878;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 1a121b49d..03d6a1405 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -77,33 +77,28 @@ node default {
     case extractnodeinfo($nodeinfo, '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,schein,steffani,franck:   { include named::recursor }
-    }
-
-    case $hostname {
-        franck,powell,logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky,heininen,nielsen,kokkonen,kaufmann: { include ferm }
+        bartok,schein,steffani,ries,franck,liszt,master:   { include named::recursor }
     }
 
     case $hostname {
-        agricola,albeniz,gabrielli,merulo,paer,pergolesi,pescetti,smetana,sperger,zee,zelenka: { include ferm }
-    }
-    case $hostname {
-        orff,duarte,soler,krenek,lindberg,morricone,respighi,scelsi,valente,vitry,vivaldi,wolkenstein,cilea: { include ferm }
+        cilea,merikanto,sibelius: {}
+        default: {
+             case $kernel {
+                 Linux: {
+                     include ferm
+                 }
+             }
+         }
     }
 
     case $hostname {
-        zandonai,zelenka: {
+        ancina,zandonai,zelenka: {
            @ferm::rule { "dsa-zivit-rrdcollect":
                description  => "port 6666 for rrdcollect for zivit",
                rule         => "&SERVICE_RANGE(tcp, 6666, ( 10.130.18.71 ))"
@@ -112,6 +107,10 @@ node default {
                description  => "port 10050 for zabbix for zivit",
                rule         => "&SERVICE_RANGE(tcp, 10050, ( 10.130.18.76 ))"
            }
+	   @ferm::rule { "dsa-time":
+		    description     => "Allow time access",
+		    rule            => "&SERVICE_RANGE(tcp, time, \$HOST_NAGIOS_V4)"
+	   }
         }
         piatti: {
            @ferm::rule { "dsa-udd-stunnel":
@@ -126,7 +125,7 @@ node default {
 		    rule            => "&SERVICE(tcp, 873)"
 	   }
         }
-        saens,villa,lobos,raff,gluck,schein,wieck,steffani,franck,morricone,valente: {
+        saens,villa,lobos,raff,gluck,schein,wieck,steffani,ries,rietz,franck,morricone,valente,klecker: {
            @ferm::rule { "dsa-ftp":
 		    domain          => "(ip ip6)",
 		    description     => "Allow ftp access",
@@ -138,12 +137,6 @@ 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",
@@ -199,18 +192,13 @@ node default {
 		    rule            => "&SERVICE(tcp, 873)"
 	   }
 	}
-	cilea: {
-           @ferm::rule { "dsa-sip":
+	liszt: {
+           @ferm::rule { "smtp":
 		    domain          => "(ip ip6)",
-		    description     => "Allow sip access",
-		    rule            => "&TCP_UDP_SERVICE(5060)"
+		    description     => "Allow smtp access",
+		    rule            => "&SERVICE(tcp, 25)"
            }
-	   @ferm::rule { "dsa-sipx":
-		    domain          => "(ip ip6)",
-		    description     => "Allow sipx access",
-		    rule            => "&TCP_UDP_SERVICE(5080)"
-	   }
-	}
+        }
     }
     case $brokenhosts {
         "true":    { include hosts }