X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Ftemplates%2Fferm.conf.erb;h=9a2442875c9a5aa97ea4b9a6f3f3b7bdad8f63c3;hb=522c39359d52cb9803aef0f985d627811e56a1ca;hp=1981abbfba62d4f2576c0457d3376f1da673f7ad;hpb=f2c3ac3b6d62f9e0d049e370aa031daea503b7c7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/ferm.conf.erb b/modules/ferm/templates/ferm.conf.erb
index 1981abbfb..9a2442875 100644
--- a/modules/ferm/templates/ferm.conf.erb
+++ b/modules/ferm/templates/ferm.conf.erb
@@ -7,39 +7,6 @@
 
 @include 'conf.d/';
 
-domain (ip ip6) {
-        table filter {
-              chain log_and_reject {
-                      NFLOG nflog-prefix "REJECT: ";
-                      proto tcp REJECT reject-with tcp-reset;
-                      REJECT;
-              }
-
-              chain log_or_drop {
-                      mod hashlimit hashlimit-name nflogreject  hashlimit-mode srcip hashlimit-burst 10 hashlimit 1/second jump log_and_reject;
-                      mod hashlimit hashlimit-name nfloglogdrop hashlimit-mode srcip hashlimit-burst 10 hashlimit 1/second NFLOG nflog-prefix "DROP: ";
-                      DROP;
-              }
-
-        }
-}
-domain (ip ip6) {
-        table filter {
-              chain INPUT {
-                      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;
-              }
-        }
-}
-
 @include 'dsa.d/';
 
 domain (ip ip6) {