Using hiera again for firewall_ssl_ratelimit

diff --git a/manifests/subsystems/firewall/vserver.pp b/manifests/subsystems/firewall/vserver.pp
index a83b608b8b3c9b682f905b59cf49dd3f61a8e23e..191afcacdf4a73887afe0c7c88e9e0ee2252f27d 100644 (file)
--- a/manifests/subsystems/firewall/vserver.pp
+++ b/manifests/subsystems/firewall/vserver.pp
@@ -28,7 +28,7 @@ class firewall::vserver::https($destination, $zone = 'vm') {
     destination     => "$zone:$destination:443",
     proto           => 'tcp',
     destinationport => '443',
-    ratelimit       => "$firewall_ssl_ratelimit",
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),,
     order           => 602,
   }
 
@@ -39,7 +39,7 @@ class firewall::vserver::https($destination, $zone = 'vm') {
     proto           => 'tcp',
     destinationport => '443',
     originaldest    => "$ipaddress",
-    ratelimit       => "$firewall_ssl_ratelimit",
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),,
     order           => 602,
   }
 }
@@ -51,7 +51,7 @@ class firewall::vserver::puppetmaster($destination, $puppetmaster_port = '8140',
     destination     => "$zone:$destination:$puppetmaster_port",
     proto           => 'tcp',
     destinationport => "$puppetmaster_port",
-    ratelimit       => "$firewall_ssl_ratelimit",
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),,
     order           => 700,
   }
 
@@ -61,7 +61,7 @@ class firewall::vserver::puppetmaster($destination, $puppetmaster_port = '8140',
     destination     => "$zone:$destination:$puppetmaster_port",
     proto           => 'udp',
     destinationport => "$puppetmaster_port",
-    ratelimit       => "$firewall_ssl_ratelimit",
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),,
     order           => 701,
   }
 
@@ -72,7 +72,7 @@ class firewall::vserver::puppetmaster($destination, $puppetmaster_port = '8140',
     proto           => 'tcp',
     destinationport => "$puppetmaster_port",
     originaldest    => "$ipaddress",
-    ratelimit       => "$firewall_ssl_ratelimit",
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),,
     order           => 702,
   }
 
@@ -83,7 +83,7 @@ class firewall::vserver::puppetmaster($destination, $puppetmaster_port = '8140',
     proto           => 'udp',
     destinationport => "$puppetmaster_port",
     originaldest    => "$ipaddress",
-    ratelimit       => "$firewall_ssl_ratelimit",
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),,
     order           => 703,
   }
 
@@ -204,7 +204,7 @@ class firewall::vserver::mail($destination, $zone = 'fw') {
     destination     => "$zone:$destination:993",
     proto           => 'tcp',
     destinationport => '993',
-    ratelimit       => "$firewall_ssl_ratelimit",
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),,
     order           => 1002,
   }
 
@@ -215,7 +215,7 @@ class firewall::vserver::mail($destination, $zone = 'fw') {
     proto           => 'tcp',
     destinationport => '993',
     originaldest    => "$ipaddress",
-    ratelimit       => "$firewall_ssl_ratelimit",
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),,
     order           => 1003,
   }
 
@@ -225,7 +225,7 @@ class firewall::vserver::mail($destination, $zone = 'fw') {
     destination     => "$zone:$destination:587",
     proto           => 'tcp',
     destinationport => '587',
-    ratelimit       => "$firewall_ssl_ratelimit",
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),,
     order           => 1004,
   }
 
@@ -236,7 +236,7 @@ class firewall::vserver::mail($destination, $zone = 'fw') {
     proto           => 'tcp',
     destinationport => '587',
     originaldest    => "$ipaddress",
-    ratelimit       => "$firewall_ssl_ratelimit",
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),,
     order           => 1005,
   }
 }