X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=1df7bdb1019338742f744332f541dbb577f5b224;hb=ed9c729b83a62494467aed2f2042f24944120f6b;hp=051fab72760e3129349365a3fac998dfe27ab89d;hpb=8f07d41aa9a11a6119b98c0217d844bd08143bd2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 051fab727..1df7bdb10 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,7 +3,7 @@ class ferm::per-host {
 		include ferm::zivit
 	}
 
-	if $::hostname in [glinka,klecker,merikanto,powell,ravel,rietz,senfl,sibelius,stabile] {
+	if $::hostname in [glinka,klecker,merikanto,ravel,rietz,senfl,sibelius,stabile] {
 		ferm::rule { 'dsa-rsync':
 			domain      => '(ip ip6)',
 			description => 'Allow rsync access',
@@ -48,6 +48,20 @@ class ferm::per-host {
 				rule            => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))'
 			}
 		}
+		bendel: {
+			@ferm::rule { 'listmaster-ontp-in':
+				description	=> 'ONTP has a broken mail setup',
+				table		=> 'filter',
+				chain		=> 'INPUT',
+				rule		=> 'source 188.165.23.89/32 proto tcp dport 25 jump DROP',
+			}
+			@ferm::rule { 'listmaster-ontp-out':
+				description	=> 'ONTP has a broken mail setup',
+				table		=> 'filter',
+				chain		=> 'OUTPUT',
+				rule		=> 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
+			}
+		}
 		danzi: {
 			@ferm::rule { 'dsa-postgres-danzi':
 				description     => 'Allow postgress access',
@@ -88,17 +102,6 @@ class ferm::per-host {
 				rule            => '&SERVICE(udp, 69)'
 			}
 		}
-		powell: {
-			@ferm::rule { 'dsa-powell-v6-tunnel':
-				description     => 'Allow powell to use V6 tunnel broker',
-				rule            => 'proto ipv6 saddr 212.227.117.6 jump ACCEPT'
-			}
-			@ferm::rule { 'dsa-powell-btseed':
-				domain          => '(ip ip6)',
-				description     => 'Allow powell to seed BT',
-				rule            => 'proto tcp dport 8000:8100 jump ACCEPT'
-			}
-		}
 		lotti,lully: {
 			@ferm::rule { 'dsa-syslog':
 				description     => 'Allow syslog access',
@@ -200,6 +203,12 @@ REJECT reject-with icmp-admin-prohibited
 				rule        => 'source 82.195.75.108 proto (tcp udp) sport 53 jump NOTRACK'
 			}
 		}
+		sonntag: {
+			@ferm::rule { 'dsa-bugs-search':
+				description  => 'port 1978 for bugs-search from bug web frontends',
+				rule         => '&SERVICE_RANGE(tcp, 1978, ( 140.211.166.26 206.12.19.140 ))'
+			}
+		}
 		default: {}
 	}
 
@@ -297,7 +306,7 @@ REJECT reject-with icmp-admin-prohibited
 		default: {}
 	}
 	case $::hostname {
-		bm-bl1,bm-bl9: {
+		bm-bl1,bm-bl2: {
 			@ferm::rule { 'dsa-vrrp':
 				rule            => 'proto vrrp daddr 224.0.0.18 jump ACCEPT',
 			}
@@ -307,4 +316,12 @@ REJECT reject-with icmp-admin-prohibited
 		}
 		default: {}
 	}
+	case $::hostname {
+		bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14: {
+			@ferm::rule { 'dsa-hwnet-vlan20':
+				rule            => 'interface vlan20 jump ACCEPT',
+			}
+		}
+		default: {}
+	}
 }