]> git.donarmstrong.com Git - dsa-puppet.git/blobdiff - modules/ferm/manifests/per-host.pp
bodge the last few for now
[dsa-puppet.git] / modules / ferm / manifests / per-host.pp
index 5f175260aeb625685ab31e35afa8e9067af812d6..70e0e73f228dc6067cd1fed2ad5b4fcd9a60219b 100644 (file)
@@ -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':
@@ -40,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',
@@ -62,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)'
@@ -153,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
 '
@@ -225,7 +222,4 @@ REJECT reject-with icmp-admin-prohibited
                default: {}
        }
 
-       if $::rsyncd {
-               include ferm::rsync
-       }
 }