X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/35604b8c528919ec730fd8ef5646b60edd65e2ac..7f5c025954a0868b7ac2aea8722089e75c39668e:/cookbooks/networking/templates/default/shorewall-rules.erb

diff --git a/cookbooks/networking/templates/default/shorewall-rules.erb b/cookbooks/networking/templates/default/shorewall-rules.erb
index dbe0120cb..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
-<% @rules.each do |r| -%>
-<%= r[:action] %>		<%= r[:source] %>	<%= r[:dest] %>	<%= r[:proto] %>		<%= r[:dest_ports] %>	<%= r[:source_ports] %>	-	<%= r[:rate_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[:connection_limit] %> -	-	- <%= r[:helper] %>
 <% end -%>