From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 9 Feb 2013 18:21:04 +0000 (+0100)
Subject: remove fbsd
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=477e09ec624de2cf07adc7a0dc258ac2de51dfc6;p=mirror%2Fdsa-puppet.git

remove fbsd
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index d41d2784e..823a38383 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -174,7 +174,7 @@ class ferm::per-host {
 		default: {}
 	}
 
-	if $::hostname in [rautavaara,luchesi,czerny] {
+	if $::hostname in [rautavaara,luchesi] {
 		@ferm::rule { 'dsa-to-kfreebsd':
 			description     => 'Traffic routed to kfreebsd hosts',
 			chain           => 'to-kfreebsd',
@@ -237,25 +237,6 @@ 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
 '
 			}
 		}