X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fferm-rule.erb;h=235b8e329112ab7dbdea5cf2d551674251392106;hb=1a5a75449b3bccf694a0f70bff7a294f990d9215;hp=bae5b17e8878575d5a0b7a13825c855c9915f59f;hpb=b76b5040a3e6511b70c26fc33f51f633a9cd6372;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/ferm-rule.erb b/modules/ferm/templates/ferm-rule.erb
index bae5b17e8..235b8e329 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 -%>
+
 		}
 	}
 }