Add helper support to firewall_rule

diff --git a/cookbooks/networking/definitions/firewall_rule.rb b/cookbooks/networking/definitions/firewall_rule.rb
index 09a28af7910abc59f9d3c2e5616e9f9dc64ea082..9dc591a537334c5a18f1b3d63ecfd1aff379e34e 100644 (file)
--- a/cookbooks/networking/definitions/firewall_rule.rb
+++ b/cookbooks/networking/definitions/firewall_rule.rb
@@ -26,7 +26,8 @@ define :firewall_rule, :action => :accept do
     :dest_ports => params[:dest_ports] || "-",
     :source_ports => params[:source_ports] || "-",
     :rate_limit => params[:rate_limit] || "-",
-    :connection_limit => params[:connection_limit] || "-"
+    :connection_limit => params[:connection_limit] || "-",
+    :helper => params[:helper] || "-"
   ]
 
   if params[:family].nil?

diff --git a/cookbooks/networking/templates/default/shorewall-rules.erb b/cookbooks/networking/templates/default/shorewall-rules.erb
index 0b13f7ba0f5d37939a5e6ab20fa8e5c2291dad75..660eec13071dbb310817a97fd259e97fb332c471 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall-rules.erb
+++ b/cookbooks/networking/templates/default/shorewall-rules.erb
@@ -6,8 +6,8 @@
 SECTION NEW
 <% end -%>
 
-# ACTION       SOURCE  DEST    PROTO           DEST            SOURCE  ORIGINAL        RATE    USER    MARK    CONNLIMIT
-#                                              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[:connection_limit] %>
+<%= r[:action] %>              <%= r[:source] %>       <%= r[:dest] %> <%= r[:proto] %>                <%= r[:dest_ports] %>   <%= r[:source_ports] %> -       <%= r[:rate_limit] %>   -       -       <%= r[:connection_limit] %> -   -       - <%= r[:helper] %>
 <% end -%>