X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Fmanifests%2Finit.pp;h=ee50bd0a3109ba2dcda57f4b48e5d1fa0f3803ad;hb=fc12446d1c57ce8ffc3546f9a58c8e6f9cca404a;hp=1ba4477a02d789e81b57231892f6400915946eb6;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index 1ba4477a0..ee50bd0a3 100644
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -10,7 +10,7 @@ class munin {
 	}
 
 	file { '/etc/munin/munin-node.conf':
-		content => template('munin/munin-node.conf.erb')
+		content => template('munin/munin-node.conf.erb'),
 		require => Package['munin-node'],
 		notify  => Service['munin-node'],
 	}
@@ -30,14 +30,14 @@ class munin {
 
 	@ferm::rule { 'dsa-munin-v4':
 		description     => 'Allow munin from munin master',
-		rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V4 \$HOST_NAGIOS_V4) ACCEPT; }',
+		rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr ($HOST_MUNIN_V4 $HOST_NAGIOS_V4) ACCEPT; }',
 		notarule        => true,
 	}
 
 	@ferm::rule { 'dsa-munin-v6':
 		description     => 'Allow munin from munin master',
 		domain          => 'ip6',
-		rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V6 \$HOST_NAGIOS_V6) ACCEPT; }',
+		rule            => 'proto tcp mod state state (NEW) dport (munin) @subchain \'munin\' { saddr ($HOST_MUNIN_V6 $HOST_NAGIOS_V6) ACCEPT; }',
 		notarule        => true,
 	}
 }