Modernise shorewall configuration

[chef.git] / 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 89d8a2d54ae8a5887606a358c267787ab7b86dff..4701b9641cc20540a1d90c4c53b316996f9d7737 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall-interfaces.erb
+++ b/cookbooks/networking/templates/default/shorewall-interfaces.erb
@@ -1,13 +1,15 @@
 # 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    tun+            nosmurfs,tcpflags