From: Stephen Gran <steve@lobefin.net>
Date: Mon, 1 Jul 2013 11:27:51 +0000 (+0100)
Subject: break d.o firewalls everywhere
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b76b5040a3e6511b70c26fc33f51f633a9cd6372;p=mirror%2Fdsa-puppet.git

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 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 -%>
 		}
 	}
 }