X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ffiles%2Fferm.conf;h=5f77ce48530fb0a42ce3e63f195229299b8764f1;hb=e1a208d4e2f90ce7a6e72d211737385a0ce8bf1c;hp=c63c8ea7d936307e636161e77b184c4abf4260b8;hpb=76dcb31392a8db7eb744df0b98cfea2c7b61a48d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/files/ferm.conf b/modules/ferm/files/ferm.conf
index c63c8ea7d..5f77ce485 100644
--- a/modules/ferm/files/ferm.conf
+++ b/modules/ferm/files/ferm.conf
@@ -16,8 +16,8 @@ domain ip {
               }
 
               chain log_or_drop {
-                      mod hashlimit hashlimit-name ulogreject  hashlimit-mode srcip hashlimit-burst 30 hashlimit 15/second jump log_and_reject;
-                      mod hashlimit hashlimit-name uloglogdrop hashlimit-mode srcip hashlimit-burst 30 hashlimit 15/second ULOG ulog-prefix "DROP: ";
+                      mod hashlimit hashlimit-name ulogreject  hashlimit-mode srcip hashlimit-burst 10 hashlimit 1/second jump log_and_reject;
+                      mod hashlimit hashlimit-name uloglogdrop hashlimit-mode srcip hashlimit-burst 10 hashlimit 1/second ULOG ulog-prefix "DROP: ";
                       DROP;
               }
 
@@ -32,8 +32,8 @@ domain ip6 {
               }
 
               chain log_or_drop {
-                      mod hashlimit hashlimit-name logreject  hashlimit-mode srcip hashlimit-burst 30 hashlimit 15/second jump log_and_reject;
-                      mod hashlimit hashlimit-name loglogdrop hashlimit-mode srcip hashlimit-burst 30 hashlimit 15/second LOG log-prefix "DROP: ";
+                      mod hashlimit hashlimit-name logreject  hashlimit-mode srcip hashlimit-burst 10 hashlimit 1/second jump log_and_reject;
+                      mod hashlimit hashlimit-name loglogdrop hashlimit-mode srcip hashlimit-burst 10 hashlimit 1/second LOG log-prefix "DROP: ";
                       DROP;
               }
         }
@@ -41,10 +41,15 @@ domain ip6 {
 domain (ip ip6) {
         table filter {
               chain INPUT {
-                      policy DROP;
+                      policy ACCEPT;
                       mod state state (ESTABLISHED RELATED) ACCEPT;
                       interface lo ACCEPT;
                       proto icmp ACCEPT;
+                      # some of our hosts (e.g. villa and lobos) do ipv6 via tunnels (proto 41)
+                      # this requires we allow proto ipv6 to work in all cases.
+                      # without this, ipv6 connectivity only works once the host itself
+                      # created some ipv6 connectivity to some place.
+                      proto ipv6 ACCEPT;
                       mod state state (INVALID) DROP;
               }
         }
@@ -54,8 +59,11 @@ domain (ip ip6) {
 
 domain (ip ip6) {
         chain INPUT {
-                proto udp dport 137 DROP;
-                proto tcp mod multiport destination-ports (137 445) DROP;
+                proto (tcp udp) mod multiport destination-ports (135 137 138 139 445 1026 1027 1433) DROP;
                 jump log_or_drop;
         }
 }
+
+@hook post "umask 0177; iptables-save | sed -e 's/\[.*//' -e 's/^#.*//' | sha256sum > /var/run/iptables-ferm.checksum";
+@hook post "umask 0177; ip6tables-save | sed -e 's/\[.*//' -e 's/^#.*//' | sha256sum > /var/run/ip6tables-ferm.checksum";
+# vim:set et: