From: Stephen Gran <steve@lobefin.net>
Date: Sat, 20 Feb 2010 22:13:33 +0000 (+0000)
Subject: and actually quote correctly
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8e9a688dd67c65c08c9c4f90bf0f5a7df15549a5;p=dsa-puppet.git

and actually quote correctly

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 03f29bd1..1f413569 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -130,7 +130,7 @@ class apache2 {
                refreshonly => true,
 	}
         ferm::rule { "dsa-apache":
-                domain          => (ip ip6),
+                domain          => "(ip ip6)",
                 description     => "Allow web access",
                 rule            => "proto tcp mod state state (NEW) dport (80) ACCEPT"
         }
diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 4acee3b6..8ab4f625 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -157,7 +157,7 @@ class exim {
         refreshonly => true,
     }
     ferm::rule { "dsa-exim":
-            domain          => (ip ip6),
+            domain          => "(ip ip6)",
             description     => "Allow smtp access",
             rule            => "proto tcp mod state state (NEW) dport (25) ACCEPT"
     }
diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index c8727dde..0849cc1b 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -76,7 +76,7 @@ class munin-node {
         refreshonly => true,
     }
     ferm::rule { "dsa-munin":
-            domain          => (ip ip6),
+            domain          => "(ip ip6)",
             description     => "Allow munin from munin master",
             rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN) ACCEPT; }"
     }
diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 7fcbb03d..053c6dc6 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -46,7 +46,7 @@ class nagios::client inherits nagios {
 		refreshonly => true,
 	}
         ferm::rule { "dsa-nagios":
-                domain          => (ip ip6),
+                domain          => "(ip ip6)",
                 description     => "Allow nrpe from nagios master",
                 rule            => "proto tcp mod state state (NEW) dport (5666) @subchain 'nagios' { saddr (\$HOST_NAGIOS) ACCEPT; }"
         }
diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 9c4b82b1..0bbcde32 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -26,7 +26,7 @@ class named {
                         ;
         }
         ferm::rule { "dsa-bind":
-                domain          => (ip ip6),
+                domain          => "(ip ip6)",
                 description     => "Allow nameserver access",
                 rule            => "proto (udp tcp) mod state state (NEW) dport (53) ACCEPT"
         }
diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index a499bb63..fb564641 100644
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -26,7 +26,7 @@ class ntp {
 		refreshonly => true,
 	}
         ferm::rule { "dsa-ntp":
-                domain          => (ip ip6),
+                domain          => "(ip ip6)",
                 description     => "Allow ntp access",
                 rule            => "proto udp mod state state (NEW) dport (123) ACCEPT"
         }