diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-06-09 17:52:57 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-06-09 17:52:57 -0300 |
| commit | 40a9f5b6d556615ad95085b51ec56585dfbe248d (patch) | |
| tree | 9cc6b3cbf5c767422a1c73ac374127f659f24b26 /manifests/virtual/mail.pp | |
| parent | 059ddc10d09b87f1e21807d0aedff08745f8701a (diff) | |
| download | puppet-firewall-40a9f5b6d556615ad95085b51ec56585dfbe248d.tar.gz puppet-firewall-40a9f5b6d556615ad95085b51ec56585dfbe248d.tar.bz2 | |
Updates some firewall::virtual rules to new kvm scheme
Diffstat (limited to 'manifests/virtual/mail.pp')
| -rw-r--r-- | manifests/virtual/mail.pp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/manifests/virtual/mail.pp b/manifests/virtual/mail.pp index 83589ce..75eec5f 100644 --- a/manifests/virtual/mail.pp +++ b/manifests/virtual/mail.pp @@ -1,18 +1,19 @@ -class firewall::virtual::mail($destination, $zone = 'fw') { +class firewall::virtual::mail($destination) { shorewall::rule { 'mail-1': action => 'DNAT', - source => 'net', - destination => "$zone:$destination:25", + source => 'vm', + destination => "fw:$destination:25", proto => 'tcp', destinationport => '25', + originaldest => hiera('firewall::external_ip', $::ipaddress), ratelimit => '-', order => 1000, } shorewall::rule { 'mail-2': action => 'DNAT', - source => '$FW', - destination => "$zone:$destination:25", + source => 'net', + destination => "vm:$destination:25", proto => 'tcp', destinationport => '25', originaldest => hiera('firewall::external_ip', $::ipaddress), @@ -22,18 +23,19 @@ class firewall::virtual::mail($destination, $zone = 'fw') { shorewall::rule { 'mail-3': action => 'DNAT', - source => 'net', - destination => "$zone:$destination:993", + source => 'vm', + destination => "fw:$destination:993", proto => 'tcp', destinationport => '993', + originaldest => hiera('firewall::external_ip', $::ipaddress), ratelimit => hiera("firewall::ssl_ratelimit", '-'), order => 1002, } shorewall::rule { 'mail-4': action => 'DNAT', - source => '$FW', - destination => "$zone:$destination:993", + source => 'net', + destination => "vm:$destination:993", proto => 'tcp', destinationport => '993', originaldest => hiera('firewall::external_ip', $::ipaddress), @@ -43,18 +45,19 @@ class firewall::virtual::mail($destination, $zone = 'fw') { shorewall::rule { 'mail-5': action => 'DNAT', - source => 'net', - destination => "$zone:$destination:587", + source => 'vm', + destination => "fw:$destination:587", proto => 'tcp', destinationport => '587', + originaldest => hiera('firewall::external_ip', $::ipaddress), ratelimit => hiera("firewall::ssl_ratelimit", '-'), order => 1004, } shorewall::rule { 'mail-6': action => 'DNAT', - source => '$FW', - destination => "$zone:$destination:587", + source => 'net', + destination => "vm:$destination:587", proto => 'tcp', destinationport => '587', originaldest => hiera('firewall::external_ip', $::ipaddress), |