From: Stephen Gran <steve@lobefin.net>
Date: Mon, 1 Jul 2013 11:31:00 +0000 (+0100)
Subject: Revert "break d.o firewalls everywhere"
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=c68a0c0f0903d19e9d4a661f3eeb41ec2a40e9ce

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 bae5b17e..235b8e32 100644
--- 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 -%>
+
 		}
 	}
 }