X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fferm.conf.erb;h=9a2442875c9a5aa97ea4b9a6f3f3b7bdad8f63c3;hb=cc4324e091102b8dfd1d2845db2cb9110119a5aa;hp=5f77ce48530fb0a42ce3e63f195229299b8764f1;hpb=a2aea510648d1d58789365a2d0b7bae76fcca37b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/ferm.conf.erb b/modules/ferm/templates/ferm.conf.erb
index 5f77ce485..9a2442875 100644
--- a/modules/ferm/templates/ferm.conf.erb
+++ b/modules/ferm/templates/ferm.conf.erb
@@ -7,54 +7,6 @@
 
 @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 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;
-              }
-
-        }
-}
-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 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;
-              }
-        }
-}
-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) {
@@ -64,6 +16,7 @@ domain (ip ip6) {
         }
 }
 
+@hook pre "umask 0177; rm -f /var/run/iptables-ferm.checksum /var/run/ip6tables-ferm.checksum";
 @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: