Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[dsa-puppet.git] / modules / ferm / files / ferm.conf

diff --git a/modules/ferm/files/ferm.conf b/modules/ferm/files/ferm.conf
index e213a0474cfd4f3cc86496dd46054657af6fa1bb..95e7393544c8027bb12111ae15cb254b0de68261 100644 (file)
--- a/modules/ferm/files/ferm.conf
+++ b/modules/ferm/files/ferm.conf
@@ -8,28 +8,61 @@
 @include 'conf.d/';
 
 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 OUTPUT) {
+                      NOP;
+              }
+        }
 }
 
+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) {
-       chain INPUT {
-               policy DROP;
-               mod state state (ESTABLISHED RELATED) ACCEPT;
-               interface lo ACCEPT;
-               proto icmp ACCEPT;
-               mod state state (INVALID) DROP;
-       }
+        table filter {
+              chain INPUT {
+                      policy DROP;
+                      mod state state (ESTABLISHED RELATED) ACCEPT;
+                      interface lo ACCEPT;
+                      proto icmp 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;
+        }
+}