From b76b5040a3e6511b70c26fc33f51f633a9cd6372 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 1 Jul 2013 12:27:51 +0100 Subject: [PATCH] break d.o firewalls everywhere Signed-off-by: Stephen Gran --- modules/ferm/templates/ferm-rule.erb | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/modules/ferm/templates/ferm-rule.erb b/modules/ferm/templates/ferm-rule.erb index 235b8e329..bae5b17e8 100644 --- a/modules/ferm/templates/ferm-rule.erb +++ b/modules/ferm/templates/ferm-rule.erb @@ -3,11 +3,21 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## -domain <%= domain %> { - table <%= table %> { - chain <%= chain %> { - <%= rule %><% unless notarule -%>;<% end -%> - +<% + output = @rule + if @description.length > 0 + output += ' mod comment comment "' + output += @description + output += '"' + end + unless @notarule + output += ';' + end +-%> +domain <%= @domain %> { + table <%= @table %> { + chain <%= @chain %> { + <%= output -%> } } } -- 2.20.1