X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=aa20cbd63e37bd2c1526f001300d65c7f87c59c8;hb=99ed9a8b3de0955483a1036b6520accf8c02f755;hp=f00dc4f3378401206478c6f6cdad388f1f4a590c;hpb=1a4056c33fac8412d3f7fdabcc6922878de1a717;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index f00dc4f33..aa20cbd63 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -6,13 +6,7 @@ class ferm::per-host {
     }
 
     case $hostname {
-        chopin,franck,gluck,kaufmann,kassia,klecker,lobos,merikanto,morricone,raff,ravel,ries,rietz,saens,schein,senfl,stabile,steffani,valente,villa,wieck: {
-            include ferm::rsync
-        }
-    }
-
-    case $hostname {
-        chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,raff,ries,rietz,saens,schein,steffani,valente,villa,wieck: {
+        chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,santoro,steffani,valente,villa,wieck,stabile: {
             include ferm::ftp
         }
     }
@@ -24,6 +18,19 @@ class ferm::per-host {
                 rule         => "&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))"
             }
         }
+        danzi: {
+                @ferm::rule { "dsa-postgres-danzi":
+                    description     => "Allow postgress access",
+                    rule            => "&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 ))"
+                }
+
+        }
+        abel,alwyn,rietz: {
+            @ferm::rule { "dsa-tftp":
+                description     => "Allow tftp access",
+                rule            => "&SERVICE(udp, 69)"
+            }
+        }
         paganini: {
             @ferm::rule { "dsa-dhcp":
                 description     => "Allow dhcp access",
@@ -55,10 +62,6 @@ class ferm::per-host {
                 description     => "Allow powell to seed BT",
                 rule            => "proto tcp dport 8000:8100 jump ACCEPT"
             }
-            @ferm::rule { "dsa-powell-rsync":
-                description     => "Hoster wants to sync from here, and why not",
-                rule            => "&SERVICE_RANGE(tcp, rsync, ( 195.20.242.90 192.25.206.33 82.195.75.106 206.12.19.118 ))"
-            }
         }
         heininen,lotti: {
             @ferm::rule { "dsa-syslog":
@@ -136,7 +139,7 @@ class ferm::per-host {
                                 source ($HOST_MAILRELAY_V4 $HOST_NAGIOS_V4) proto tcp dport 25 ACCEPT;
                                 source ($HOST_MUNIN_V4 $HOST_NAGIOS_V4) proto tcp dport 4949 ACCEPT;
                                 source ($HOST_NAGIOS_V4) proto tcp dport 5666 ACCEPT;
-                                source ($HOST_NAGIOS_V4) proto udp dport ntp ACCEPT;
+                                source ($HOST_NAGIOS_V4) proto udp dport ntp ACCEPT
                                '
         }
         @ferm::rule { "dsa-from-kfreebsd":
@@ -146,8 +149,8 @@ class ferm::per-host {
                                 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 ACCEPT; # loghost
-                                proto tcp dport (25 submission) daddr ($HOST_MAILRELAY_V4) ACCEPT;
+                                proto tcp dport 5140 daddr (82.195.75.98 206.12.19.121) ACCEPT; # loghost
+                                proto tcp dport (25 submission) daddr ($HOST_MAILRELAY_V4) ACCEPT
                                '
         }
     }}
@@ -166,7 +169,7 @@ class ferm::per-host {
                                     interface vlan11 outerface eth0 jump from-kfreebsd;
                                     interface eth0 destination ($FREEBSD_HOSTS) jump to-kfreebsd;
                                     ULOG ulog-prefix "REJECT FORWARD: ";
-                                    REJECT reject-with icmp-admin-prohibited;
+                                    REJECT reject-with icmp-admin-prohibited
                                     '
             }
         }
@@ -186,7 +189,7 @@ class ferm::per-host {
                                     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;
+                                    REJECT reject-with icmp-admin-prohibited
                                     '
             }
         }
@@ -201,7 +204,7 @@ class ferm::per-host {
             @ferm::rule { "dsa-nat-snapshot-varnish":
                 table           => 'nat',
                 chain           => 'PREROUTING',
-                rule            => 'proto tcp daddr 193.62.202.28 dport 80 REDIRECT to-ports 6081',
+                rule            => 'proto tcp daddr 193.62.202.30 dport 80 REDIRECT to-ports 6081',
             }
         }
         stabile: {