X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d119402a5fdb9dee5396a643f4fdf653f7d90e13;hb=d1d9e3a665000dcb2174b8e587a8221efcdc9032;hp=0165241cfd231a220f6c20b0c50f351ecbb53cba;hpb=3c0ead89cffcdb0f2ce58bee6077073225fdc0ab;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 0165241cf..d119402a5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -91,7 +91,7 @@ node default {
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball: { 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 {
         piatti: {
@@ -119,10 +119,21 @@ node default {
 		    rule            => "&SERVICE(tcp, 873)"
 	   }
         }
-        ancina,zelenka {
+        ancina,zelenka: {
 	   @ferm::rule { "dsa-time":
 		    description     => "Allow time access",
-		    rule            => "&SERVICE(udp, time, $HOST_NAGIOS_V4)"
+		    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)"
 	   }
         }