X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ffiles%2Fferm.conf;h=5f6e159f67145ba6119fb0bd85989921791869bc;hb=ae1fb81893bf9b0417ed8814923907aea9c751bb;hp=ff458597e4f574f4c9a717d0ce4b1a5fb1cfb8ea;hpb=9275cce63a4bf7ec3375cb35f3c651a4a9fa34d1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/files/ferm.conf b/modules/ferm/files/ferm.conf
index ff458597e..5f6e159f6 100644
--- a/modules/ferm/files/ferm.conf
+++ b/modules/ferm/files/ferm.conf
@@ -7,27 +7,60 @@
 
 @include 'conf.d/';
 
+domain ip {
+        table filter {
+              chain log_and_reject {
+                      ULOG ulog-prefix "REJECT: ";
+                      proto tcp REJECT reject-with tcp-reset;
+                      REJECT;
+              }
+
+              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: ";
+                      DROP;
+              }
+
+        }
+}
+domain ip6 {
+        table filter {
+              chain log_and_reject {
+                      LOG log-prefix "REJECT: ";
+                      proto tcp REJECT reject-with tcp-reset;
+                      REJECT;
+              }
+
+              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: ";
+                      DROP;
+              }
+        }
+}
 domain (ip ip6) {
-	table filter {
-	      chain log_and_reject {
-	              ULOG ulog-prefix "REJECT: ";
-	              proto tcp REJECT reject-with tcp-reset;
-	              REJECT;
-	      }
-	
-	      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: ";
-	              DROP;
-	      }
+        table filter {
               chain INPUT {
                       policy DROP;
                       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;
               }
         }
 }
 
 @include 'dsa.d/';
+
+domain (ip ip6) {
+        chain INPUT {
+                proto (tcp udp) mod multiport destination-ports (135 137 138 139 445 1026 1027 1433) DROP;
+                jump log_or_drop;
+        }
+}
+# vim:set et: