diff options
Diffstat (limited to 'manifests/virtual/mail.pp')
| -rw-r--r-- | manifests/virtual/mail.pp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/manifests/virtual/mail.pp b/manifests/virtual/mail.pp index 75eec5f..c16f898 100644 --- a/manifests/virtual/mail.pp +++ b/manifests/virtual/mail.pp @@ -5,7 +5,7 @@ class firewall::virtual::mail($destination) { destination => "fw:$destination:25", proto => 'tcp', destinationport => '25', - originaldest => hiera('firewall::external_ip', $::ipaddress), + originaldest => lookup('firewall::external_ip', undef, undef, $::ipaddress), ratelimit => '-', order => 1000, } @@ -16,7 +16,7 @@ class firewall::virtual::mail($destination) { destination => "vm:$destination:25", proto => 'tcp', destinationport => '25', - originaldest => hiera('firewall::external_ip', $::ipaddress), + originaldest => lookup('firewall::external_ip', undef, undef, $::ipaddress), ratelimit => '-', order => 1001, } @@ -27,8 +27,8 @@ class firewall::virtual::mail($destination) { destination => "fw:$destination:993", proto => 'tcp', destinationport => '993', - originaldest => hiera('firewall::external_ip', $::ipaddress), - ratelimit => hiera("firewall::ssl_ratelimit", '-'), + originaldest => lookup('firewall::external_ip', undef, undef, $::ipaddress), + ratelimit => lookup("firewall::ssl_ratelimit", undef, undef, '-'), order => 1002, } @@ -38,8 +38,8 @@ class firewall::virtual::mail($destination) { destination => "vm:$destination:993", proto => 'tcp', destinationport => '993', - originaldest => hiera('firewall::external_ip', $::ipaddress), - ratelimit => hiera("firewall::ssl_ratelimit", '-'), + originaldest => lookup('firewall::external_ip', undef, undef, $::ipaddress), + ratelimit => lookup("firewall::ssl_ratelimit", undef, undef, '-'), order => 1003, } @@ -49,8 +49,8 @@ class firewall::virtual::mail($destination) { destination => "fw:$destination:587", proto => 'tcp', destinationport => '587', - originaldest => hiera('firewall::external_ip', $::ipaddress), - ratelimit => hiera("firewall::ssl_ratelimit", '-'), + originaldest => lookup('firewall::external_ip', undef, undef, $::ipaddress), + ratelimit => lookup("firewall::ssl_ratelimit", undef, undef, '-'), order => 1004, } @@ -60,8 +60,8 @@ class firewall::virtual::mail($destination) { destination => "vm:$destination:587", proto => 'tcp', destinationport => '587', - originaldest => hiera('firewall::external_ip', $::ipaddress), - ratelimit => hiera("firewall::ssl_ratelimit", '-'), + originaldest => lookup('firewall::external_ip', undef, undef, $::ipaddress), + ratelimit => lookup("firewall::ssl_ratelimit", undef, undef, '-'), order => 1005, } } |