Don't add a host restriction for empty arrays

Mezcalito · Mar 14, 2017 · 8ee9475 · 8ee9475
1 parent 805cff5
commit 8ee9475
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/templates/ferm-rule.erb b/templates/ferm-rule.erb
@@ -6,16 +6,21 @@
 domain (<%= @domain %>) {
     table <%= @table %> {
         chain <%= @chain %> {
-            <% if @host %>saddr (<% if (@host.is_a? String) %><%= @host %><% elsif (@host.is_a? Array) -%><% @host.each do |ns| %><%= ns %> <% end -%><% end -%>) {<% end -%>
-<% if (defined? @rules) %><% if (@rules.is_a? String) %>
+<% if @host and not (@host.is_a? Array and @host.empty?) -%>
+            saddr (<% if (@host.is_a? String) -%><%= @host -%><% elsif (@host.is_a? Array) -%><%= @host.join(' ') -%><% end -%>) {
+<% end -%>
+<% if (defined? @rules) -%>
+<% if (@rules.is_a? String) -%>
                 <%= @rules %>;
 <% elsif (@rules.is_a? Array) -%>
-<% @rules.each do |ns| %>                <%= ns %>;
+<% @rules.each do |ns| -%>
+                <%= ns %>;
 <% end -%>
 <% end -%>
 <% end -%>
-            <% if @host %>}<% end -%>
-
+<% if @host and not (@host.is_a? Array and @host.empty?) -%>
+            }
+<% end -%>
         }
     }
-}
+}