Merge remote-tracking branch 'github/pull/102'

[chef.git] / 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 8567a8d5a321ff5a6f9bd0376ed000cd01d26fbf..0b13f7ba0f5d37939a5e6ab20fa8e5c2291dad75 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall-rules.erb
+++ b/cookbooks/networking/templates/default/shorewall-rules.erb
@@ -1,9 +1,13 @@
 # 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
+# ACTION       SOURCE  DEST    PROTO           DEST            SOURCE  ORIGINAL        RATE    USER    MARK    CONNLIMIT
 #                                              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] %>
+<% 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] %>
 <% end -%>