X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/90f0f02ffef73e9837e9d18e4a3e46930d3d1335..a81d3cdabca3b55a19b2bcc4c2cf5a1dd30071b4:/cookbooks/networking/recipes/default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index dbbada97d..51f3f4389 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -179,6 +179,14 @@ template "/etc/shorewall/hosts" do
   notifies :restart, "service[shorewall]"
 end
 
+template "/etc/shorewall/conntrack" do
+  source "shorewall-conntrack.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+  notifies :restart, "service[shorewall]"
+end
+
 template "/etc/shorewall/policy" do
   source "shorewall-policy.erb"
   owner "root"
@@ -223,7 +231,6 @@ end
 %w[ucl ams bm].each do |zone|
   firewall_rule "accept-openvpn-#{zone}" do
     action :accept
-    family :inet
     source zone
     dest "fw"
     proto "udp"
@@ -292,6 +299,14 @@ unless node.interfaces(:family => :inet6).empty?
     notifies :restart, "service[shorewall6]"
   end
 
+  template "/etc/shorewall6/conntrack" do
+    source "shorewall-conntrack.erb"
+    owner "root"
+    group "root"
+    mode 0o644
+    notifies :restart, "service[shorewall6]"
+  end
+
   template "/etc/shorewall6/policy" do
     source "shorewall-policy.erb"
     owner "root"