aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-21 13:09:25 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-21 13:09:25 -0200
commita4dfab6e7da53d4af9936468cd7956f7416f139f (patch)
tree7366455c33ac9933a31955005abbb73e915f39ba
parent05a6badb848da626b95ccc7d4eab47ab1cb5cf68 (diff)
downloadpuppet-nodo-a4dfab6e7da53d4af9936468cd7956f7416f139f.tar.gz
puppet-nodo-a4dfab6e7da53d4af9936468cd7956f7416f139f.tar.bz2
Using hiera again for firewall_ssl_ratelimit
-rw-r--r--manifests/subsystems/firewall/vserver.pp20
1 files changed, 10 insertions, 10 deletions
diff --git a/manifests/subsystems/firewall/vserver.pp b/manifests/subsystems/firewall/vserver.pp
index a83b608..191afca 100644
--- 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,
}
}