Merge branch 'rsync-shuffle'

[dsa-puppet.git] / modules / ferm / manifests / per-host.pp

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 82f9eb8e7aecfddf0040e4e05c3a0e459e8a86b1..2756e59f0b574a16a79a65da28bdfbc5b7dc4a5d 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,6 +3,14 @@ class ferm::per-host {
                include ferm::zivit
        }
 
+       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 {
                piatti,samosa: {
                        @ferm::rule { 'dsa-udd-stunnel':
@@ -51,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)'
@@ -142,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
 '
@@ -172,7 +180,9 @@ 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;
@@ -180,6 +190,7 @@ 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
@@ -214,7 +225,4 @@ REJECT reject-with icmp-admin-prohibited
                default: {}
        }
 
-       if $::rsyncd {
-               include ferm::rsync
-       }
 }