X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=40ff44df383e194e7b31731f0be0347301f158e3;hb=d8c687681c602d3c484c5a9536fba9955b952e89;hp=786358939c2867ebd24d2dc3cbbc02212db356e0;hpb=330a065899f896b7b6e1ea737c1d3be02b382f41;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 786358939..40ff44df3 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -6,7 +6,7 @@ class ferm::per-host {
     }
 
     case $hostname {
-        chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,steffani,valente,villa,wieck,stabile: {
+        chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,santoro,steffani,valente,villa,wieck,stabile: {
             include ferm::ftp
         }
     }
@@ -25,7 +25,7 @@ class ferm::per-host {
                 }
 
         }
-        abel,alwyn: {
+        abel,alwyn,rietz: {
             @ferm::rule { "dsa-tftp":
                 description     => "Allow tftp access",
                 rule            => "&SERVICE(udp, 69)"
@@ -81,6 +81,13 @@ class ferm::per-host {
                 rule            => "&SERVICE(tcp, 11371)"
             }
         }
+        gombert: {
+            @ferm::rule { "dsa-infinoted":
+                domain          => "(ip ip6)",
+                description     => "Allow infinoted access",
+                rule            => "&SERVICE(tcp, 6523)"
+            }
+        }
         liszt: {
             @ferm::rule { "smtp":
                 domain          => "(ip ip6)",
@@ -128,6 +135,13 @@ class ferm::per-host {
                 rule            => "&TCP_UDP_SERVICE(5080)"
             }
         }
+	scelsi: {
+            @ferm::rule { "dc11-icecast":
+                domain          => "(ip ip6)",
+                description     => "Allow icecast access",
+                rule            => "&SERVICE(tcp, 8000)"
+            }
+	}
     }
 
     case $hostname { rautavaara,luchesi: {
@@ -150,6 +164,7 @@ class ferm::per-host {
                                 proto udp dport (53 123) ACCEPT;
                                 proto tcp dport 8140 daddr 82.195.75.104 ACCEPT; # puppethost
                                 proto tcp dport 5140 daddr (82.195.75.98 206.12.19.121) ACCEPT; # loghost
+                                proto tcp dport 11371 daddr 82.195.75.107 ACCEPT; # keyring host
                                 proto tcp dport (25 submission) daddr ($HOST_MAILRELAY_V4) ACCEPT
                                '
         }