exuberant quoting

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 38a77a8eb53796d214b676a060e41fa52273747f..4a213f9aa51c9aaccb96403cff136c2c213615d9 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -127,13 +127,13 @@ class exim {
 
        @ferm::rule { 'dsa-exim':
                description => 'Allow SMTP',
-               rule        => '&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)'
+               rule        => '&SERVICE_RANGE(tcp, $mail_port, $SMTP_SOURCES)'
        }
 
        @ferm::rule { 'dsa-exim-v6':
                description => 'Allow SMTP',
                domain      => 'ip6',
-               rule        => '&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)'
+               rule        => '&SERVICE_RANGE(tcp, $mail_port, $SMTP_V6_SOURCES)'
        }
 
        # Do we actually want this?  I'm only doing it because it's harmless

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index c1b4fdbca3afc289dac07dbf90749fa0d04c34e3..70a370294b9c17b90b99ccbefdea8299eea7adea 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -15,12 +15,12 @@ class exim::mx inherits exim {
 
        @ferm::rule { 'dsa-exim-submission':
                description => 'Allow SMTP',
-               rule        => '&SERVICE_RANGE(tcp, submission, \$SMTP_SOURCES)'
+               rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_SOURCES)'
        }
        @ferm::rule { 'dsa-exim-v6-submission':
                description => 'Allow SMTP',
                domain      => 'ip6',
-               rule        => '&SERVICE_RANGE(tcp, submission, \$SMTP_V6_SOURCES)',
+               rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
        }
 
 }

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 83e289470804dd7d9bc0b1eef7b50e39d42fd58f..1532f9f38a17243e47f64e832a7f8c3066940725 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -47,12 +47,12 @@ class ferm::per-host {
                handel: {
                        @ferm::rule { 'dsa-puppet':
                                description     => 'Allow puppet access',
-                               rule            => '&SERVICE_RANGE(tcp, 8140, \$HOST_DEBIAN_V4)'
+                               rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V4)'
                        }
                        @ferm::rule { 'dsa-puppet-v6':
                                domain          => 'ip6',
                                description     => 'Allow puppet access',
-                               rule            => '&SERVICE_RANGE(tcp, 8140, \$HOST_DEBIAN_V6)'
+                               rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
                        }
                }
                powell: {
@@ -69,12 +69,12 @@ class ferm::per-host {
                heininen,lotti: {
                        @ferm::rule { 'dsa-syslog':
                                description     => 'Allow syslog access',
-                               rule            => '&SERVICE_RANGE(tcp, 5140, \$HOST_DEBIAN_V4)'
+                               rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)'
                        }
                        @ferm::rule { 'dsa-syslog-v6':
                                domain          => 'ip6',
                                description     => 'Allow syslog access',
-                               rule            => '&SERVICE_RANGE(tcp, 5140, \$HOST_DEBIAN_V6)'
+                               rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V6)'
                        }
                }
                kaufmann: {

diff --git a/modules/ferm/manifests/zivit.pp b/modules/ferm/manifests/zivit.pp
index b513a3b1790db35d9280d9b08395a7dba8a4e4c8..42ae45964b011811dece138133cd61be2a2c63f0 100644 (file)
--- a/modules/ferm/manifests/zivit.pp
+++ b/modules/ferm/manifests/zivit.pp
@@ -9,7 +9,7 @@ class ferm::zivit {
        }
        @ferm::rule { 'dsa-time':
                description => 'Allow time access',
-               rule        => '&SERVICE_RANGE(tcp, time, \$HOST_NAGIOS_V4)'
+               rule        => '&SERVICE_RANGE(tcp, time, $HOST_NAGIOS_V4)'
        }
 }
 

diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp
index b45d6646c00f6c5b717bde0a334cbc245f98ceed..ee50bd0a3109ba2dcda57f4b48e5d1fa0f3803ad 100644 (file)
--- a/modules/munin/manifests/init.pp
+++ b/modules/munin/manifests/init.pp
@@ -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,
        }
 }

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 97681295cbc3986ae548b7756aa434c9cb57286b..a2482290da7c1ae8386447d752eff09d2a6508e7 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -15,13 +15,13 @@ class nagios::client inherits nagios {
 
        @ferm::rule { 'dsa-nagios-v4':
                description => 'Allow nrpe from nagios master',
-               rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr (\$HOST_NAGIOS_V4) ACCEPT; }',
+               rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V4) ACCEPT; }',
                notarule    => true,
        }
        @ferm::rule { 'dsa-nagios-v6':
                description => 'Allow nrpe from nagios master',
                domain      => 'ip6',
-               rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr (\$HOST_NAGIOS_V6) ACCEPT; }',
+               rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V6) ACCEPT; }',
                notarule    => true,
        }
 

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index b7df1810203409f994266e2cc64ab71fdf33931d..f4e24c2272eabc40088bd2a0031348b13efd5e61 100644 (file)
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -10,12 +10,12 @@ class ssh {
 
        @ferm::rule { 'dsa-ssh':
                description => 'Allow SSH from DSA',
-               rule        => '&SERVICE_RANGE(tcp, ssh, \$SSH_SOURCES)'
+               rule        => '&SERVICE_RANGE(tcp, ssh, $SSH_SOURCES)'
        }
        @ferm::rule { 'dsa-ssh-v6':
                description => 'Allow SSH from DSA',
                domain      => 'ip6',
-               rule        => '&SERVICE_RANGE(tcp, ssh, \$SSH_V6_SOURCES)'
+               rule        => '&SERVICE_RANGE(tcp, ssh, $SSH_V6_SOURCES)'
        }
 
        file { '/etc/ssh/ssh_config':