X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..699e157e3d708f38064eea9072aa210fe5ccac30:/cookbooks/networking/templates/default/shorewall-interfaces.erb

diff --git a/cookbooks/networking/templates/default/shorewall-interfaces.erb b/cookbooks/networking/templates/default/shorewall-interfaces.erb
index 89d8a2d54..3090a47cc 100644
--- a/cookbooks/networking/templates/default/shorewall-interfaces.erb
+++ b/cookbooks/networking/templates/default/shorewall-interfaces.erb
@@ -1,13 +1,16 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-# ZONE	INTERFACE	BROADCAST	OPTIONS
+?FORMAT 2
+
+# ZONE	INTERFACE	OPTIONS
 <% node[:networking][:interfaces].each do |name,interface| -%>
-<% if interface[:family] == "inet" -%>
+<% if interface[:interface] && interface[:family] == "inet" -%>
 <% if interface[:role] == "internal" -%>
-loc	<%= interface[:interface] %>		detect		nosmurfs,tcpflags
+loc	<%= interface[:interface] %>		nosmurfs,tcpflags
 <% elsif interface[:role] == "external" -%>
-net	<%= interface[:interface] %>		detect		nosmurfs,tcpflags
+net	<%= interface[:interface] %>		nosmurfs,tcpflags
 <% end -%>
 <% end -%>
 <% end -%>
-loc	tun+		detect		nosmurfs,tcpflags
+loc	wg+		nosmurfs,tcpflags
+dock	docker0		bridge