Rework firewall rule handling

[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 ffa55a9be5fefd6e44d913cc7bef241bb7be6356..7cda2fbf174a4a5c572d19b0f4caeb3a5f9877f8 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
 #                                              PORTS           PORTS   DEST            LIMIT
-<% @rules.each do |r| -%>
+<% 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] %>
 <% end -%>