X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=7be941a521216a7c17f5f0758a628958d7a3ddd4;hb=dbbffae53a46ffb3b7f6be1e0961a6ae33e104f2;hp=7c006d879b353a56790011aef34ac381f0675cc9;hpb=28b8eb9885fb9425923104181d707637d5f35e83;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 7c006d879..7be941a52 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -19,13 +19,15 @@ class ferm::per-host {
 			}
 		}
 		ullmann: {
-			@ferm::rule { 'dsa-postgres-quantz':
+			@ferm::rule { 'dsa-postgres-udd':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5452, ( 206.12.19.122/32 ))'
+				# quantz, wagner
+				rule            => '&SERVICE_RANGE(tcp, 5452, ( 206.12.19.122/32 217.196.43.134/32 217.196.43.132/32 ))'
 			}
-			@ferm::rule { 'dsa-postgres-quantz6':
+			@ferm::rule { 'dsa-postgres-udd6':
 				domain          => '(ip6)',
 				description     => 'Allow postgress access',
+				# quantz
 				rule            => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 ))'
 			}
 		}
@@ -45,6 +47,12 @@ class ferm::per-host {
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 ))'
 			}
+			@ferm::rule { 'dsa-postgres-danzi6':
+				domain          => 'ip6',
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 ))'
+			}
+
 			@ferm::rule { 'dsa-postgres2-danzi':
 				description     => 'Allow postgress access2',
 				rule            => '&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 ))'
@@ -147,17 +155,10 @@ 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)'
-			}
-		}
 		default: {}
 	}
 
-	if $::hostname in [rautavaara,luchesi] {
+	if $::hostname in [rautavaara,luchesi,czerny] {
 		@ferm::rule { 'dsa-to-kfreebsd':
 			description     => 'Traffic routed to kfreebsd hosts',
 			chain           => 'to-kfreebsd',
@@ -220,6 +221,25 @@ interface br0 destination ($ADDRESS_FISCHER $ADDRESS_FALLA) proto tcp dport 22 A
 interface br0 destination ($FREEBSD_HOSTS) jump to-kfreebsd;
 ULOG ulog-prefix "REJECT FORWARD: ";
 REJECT reject-with icmp-admin-prohibited
+'
+			}
+		}
+		czerny: {
+			@ferm::rule { 'dsa-routing':
+				description     => 'forward chain',
+				chain           => 'FORWARD',
+				rule            => 'def $ADDRESS_FILS=82.195.75.89;
+def $FREEBSD_HOSTS=($ADDRESS_FILS);
+
+policy ACCEPT;
+mod state state (ESTABLISHED RELATED) ACCEPT;
+interface br0 outerface br0 ACCEPT;
+interface br1 outerface br1 ACCEPT;
+
+interface br2 outerface br0 jump from-kfreebsd;
+interface br0 destination ($FREEBSD_HOSTS) jump to-kfreebsd;
+ULOG ulog-prefix "REJECT FORWARD: ";
+REJECT reject-with icmp-admin-prohibited
 '
 			}
 		}