X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5ac0eba538056a5568b3b9de31be692d5efeeec5..5f3a5421476c68027c50b821916585ab01f0efa1:/cookbooks/networking/templates/default/nftables.conf.erb

diff --git a/cookbooks/networking/templates/default/nftables.conf.erb b/cookbooks/networking/templates/default/nftables.conf.erb
index 94c383525..7fc46cff2 100644
--- a/cookbooks/networking/templates/default/nftables.conf.erb
+++ b/cookbooks/networking/templates/default/nftables.conf.erb
@@ -25,25 +25,23 @@ table inet filter {
   set ip-blacklist {
     type ipv4_addr
     flags dynamic
-    size 0
   }
 
   set ip6-blacklist {
     type ipv6_addr
     flags dynamic
-    size 0
   }
 
   set ratelimit-icmp-echo-ip {
     type ipv4_addr
     flags dynamic
-    size 0
+    timeout 120s
   }
 
   set ratelimit-icmp-echo-ip6 {
     type ipv6_addr
     flags dynamic
-    size 0
+    timeout 120s
   }
 
 <%- node[:networking][:firewall][:sets].each do |set| %>
@@ -54,7 +52,9 @@ table inet filter {
     type ipv6_addr
 <%- end %>
     flags dynamic
-    size 0
+<%- unless set.start_with?("connlimit-") %>
+    timeout 120s
+<%- end %>
   }
 
 <%- end %>
@@ -82,11 +82,11 @@ table inet filter {
     ct state { established, related } accept
 
     icmp type { destination-unreachable } accept
-    icmp type { echo-request } add @ratelimit-icmp-echo-ip { ip saddr limit rate 1/second } accept
+    icmp type { echo-request } update @ratelimit-icmp-echo-ip { ip saddr limit rate 1/second } accept
     icmp type { echo-request } drop
 
     icmpv6 type { nd-neighbor-solicit, nd-neighbor-advert, nd-router-solicit, nd-router-advert } accept
-    icmpv6 type { echo-request } add @ratelimit-icmp-echo-ip6 { ip6 saddr limit rate 1/second } accept
+    icmpv6 type { echo-request } update @ratelimit-icmp-echo-ip6 { ip6 saddr limit rate 1/second } accept
     icmpv6 type { echo-request } drop
 
     meta l4proto { icmp, icmpv6 } jump log-and-drop