X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2714460f8457266fec0f5f9d72d900b384d5b724..a9132885c1fbb83c7889b0b6e9c040fa2eab618e:/cookbooks/networking/templates/default/shorewall-rules.erb?ds=sidebyside

diff --git a/cookbooks/networking/templates/default/shorewall-rules.erb b/cookbooks/networking/templates/default/shorewall-rules.erb
index 7cda2fbf1..c5101bed2 100644
--- a/cookbooks/networking/templates/default/shorewall-rules.erb
+++ b/cookbooks/networking/templates/default/shorewall-rules.erb
@@ -1,13 +1,9 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<% if node[:lsb][:release].to_f >= 16.04 -%>
 ?SECTION NEW
-<% else -%>
-SECTION NEW
-<% end -%>
 
-# ACTION	SOURCE	DEST	PROTO		DEST		SOURCE	ORIGINAL	RATE
-#						PORTS		PORTS	DEST		LIMIT
+# ACTION       SOURCE    DEST  PROTO           DEST            SOURCE  ORIGINAL        RATE    USER/   MARK    CONNLIMIT  TIME  HEADERS  SWITCH  HELPER
+#                                              PORTS           PORTS   DEST            LIMIT   GROUP
 <% node[:networking][:firewall][@family].each do |r| # ~FC034 -%>
-<%= r[:action] %>		<%= r[:source] %>	<%= r[:dest] %>	<%= r[:proto] %>		<%= r[:dest_ports] %>	<%= r[:source_ports] %>	-	<%= r[:rate_limit] %>
+<%= r[:action] %>		<%= r[:source] %>	<%= r[:dest] %>	<%= r[:proto] %>		<%= r[:dest_ports] %>	<%= r[:source_ports] %>	-	<%= r[:rate_limit] %>	-	-	<%= r[:connection_limit] %> -	-	- <%= r[:helper] %>
 <% end -%>