X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/862701adfbd725c676875218f0aadde62fc9c264..c63aab768bed7807a7410ed75fd47e557ff4ebd3:/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 8567a8d5a..c5101bed2 100644
--- a/cookbooks/networking/templates/default/shorewall-rules.erb
+++ b/cookbooks/networking/templates/default/shorewall-rules.erb
@@ -2,8 +2,8 @@
 
 ?SECTION NEW
 
-# 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 -%>