break d.o firewalls everywhere

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/ferm/templates/ferm-rule.erb b/modules/ferm/templates/ferm-rule.erb
index 235b8e3..bae5b17 100644 (file)
--- 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 -%>
                }
        }
 }