X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=2756e59f0b574a16a79a65da28bdfbc5b7dc4a5d;hb=650335318c9021ace96b0cb6d49a13c1a472271f;hp=073b0a4b2eeccc144c757d1ce5e1a19af47ca662;hpb=ae040bee3562b2253cf41ac45e3ea59f031ee53f;p=dsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 073b0a4b..2756e59f 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,8 +3,12 @@ class ferm::per-host {
 		include ferm::zivit
 	}
 
-	if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,santoro,steffani,valente,villa,wieck,stabile,bizet] {
-		include ferm::ftp
+	if $::hostname in [klecker,merikanto,powell,ravel,rietz,senfl,sibelius,stabile] {
+		ferm::rule { 'dsa-rsync':
+			domain      => '(ip ip6)',
+			description => 'Allow rsync access',
+			rule        => '&SERVICE(tcp, 873)'
+		}
 	}
 
 	case $::hostname {
@@ -44,17 +48,6 @@ class ferm::per-host {
 				rule            => '&SERVICE(udp, 69)'
 			}
 		}
-		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)'
-			}
-		}
 		powell: {
 			@ferm::rule { 'dsa-powell-v6-tunnel':
 				description     => 'Allow powell to use V6 tunnel broker',
@@ -66,7 +59,7 @@ class ferm::per-host {
 				rule            => 'proto tcp dport 8000:8100 jump ACCEPT'
 			}
 		}
-		heininen,lotti: {
+		lotti,lully: {
 			@ferm::rule { 'dsa-syslog':
 				description     => 'Allow syslog access',
 				rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)'
@@ -91,13 +84,6 @@ class ferm::per-host {
 				rule            => '&SERVICE(tcp, 6523)'
 			}
 		}
-		bendel,liszt: {
-			@ferm::rule { 'smtp':
-				domain          => '(ip ip6)',
-				description     => 'Allow smtp access',
-				rule            => '&SERVICE(tcp, 25)'
-			}
-		}
 		draghi: {
 			#@ferm::rule { 'dsa-bind':
 			#    domain          => '(ip ip6)',
@@ -121,12 +107,9 @@ class ferm::per-host {
 			}
 		}
 		cilea: {
-			file {
-				'/etc/ferm/conf.d/load_sip_conntrack.conf':
-					source => 'puppet:///modules/ferm/conntrack_sip.conf',
-					require => Package['ferm'],
-					notify  => Exec['ferm restart'];
-			}
+			ferm::module { 'nf_conntrack_sip': }
+			ferm::module { 'nf_conntrack_h323': }
+
 			@ferm::rule { 'dsa-sip':
 				domain          => '(ip ip6)',
 				description     => 'Allow sip access',
@@ -167,7 +150,7 @@ source ($HOST_NAGIOS_V4) proto udp dport ntp ACCEPT
 proto tcp dport (21 22 80 53 443) ACCEPT;
 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 5140 daddr (82.195.75.99 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
 '
@@ -197,13 +180,17 @@ REJECT reject-with icmp-admin-prohibited
 				chain           => 'FORWARD',
 				rule            => 'def $ADDRESS_FANO=206.12.19.110;
 def $ADDRESS_FINZI=206.12.19.111;
-def $FREEBSD_HOSTS=($ADDRESS_FANO $ADDRESS_FINZI);
+def $ADDRESS_FISCHER=206.12.19.112;
+def $ADDRESS_FALLA=206.12.19.117;
+def $FREEBSD_HOSTS=($ADDRESS_FANO $ADDRESS_FINZI $ADDRESS_FISCHER $ADDRESS_FALLA);
 
 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 ($ADDRESS_FISCHER $ADDRESS_FALLA) proto tcp dport 22 ACCEPT;
 interface br0 destination ($FREEBSD_HOSTS) jump to-kfreebsd;
 ULOG ulog-prefix "REJECT FORWARD: ";
 REJECT reject-with icmp-admin-prohibited
@@ -238,7 +225,4 @@ REJECT reject-with icmp-admin-prohibited
 		default: {}
 	}
 
-	if $::rsyncd {
-		include ferm::rsync
-	}
 }