Switch geodns to use GeoIP2

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 85472b3166651a930f41e986248f616e5caa4059..51f3f4389aa1eb7dd4ec5f2078080e47131ac6e5 100644 (file)
--- 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"
@@ -220,10 +228,9 @@ firewall_rule "limit-icmp-echo" do
   rate_limit "s:1/sec:5"
 end
 
-%w[ucl ic bm aws].each do |zone|
+%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"