Revert "break d.o firewalls everywhere"

This reverts commit b76b5040a3e6511b70c26fc33f51f633a9cd6372.

diff --git a/modules/ferm/templates/ferm-rule.erb b/modules/ferm/templates/ferm-rule.erb
index bae5b17e8878575d5a0b7a13825c855c9915f59f..235b8e329112ab7dbdea5cf2d551674251392106 100644 (file)
--- a/modules/ferm/templates/ferm-rule.erb
+++ b/modules/ferm/templates/ferm-rule.erb
@@ -3,21 +3,11 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<%
-       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 -%>
+domain <%= domain %> {
+       table <%= table %> {
+               chain <%= chain %> {
+                       <%= rule %><% unless notarule -%>;<% end -%>
+
                }
        }
 }