diff options
author | Micah Anderson <micah@riseup.net> | 2018-01-13 11:13:23 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2018-01-13 11:13:23 -0500 |
commit | 4cf7030c0c1f9977d297d502f736029e57e36d40 (patch) | |
tree | c2219300400d0a455e8e0aba0df19c83a6de8121 /manifests/zone.pp | |
parent | 7332777829c19a63ce3d9bc50a2ddd40b940743a (diff) | |
parent | fab57483f46bab58275063081c5e4e6f7db9d2ab (diff) |
Merge remote-tracking branch 'immerda/master' into immerda_merge
Diffstat (limited to 'manifests/zone.pp')
-rw-r--r-- | manifests/zone.pp | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/manifests/zone.pp b/manifests/zone.pp index 81e5771..8ee1b58 100644 --- a/manifests/zone.pp +++ b/manifests/zone.pp @@ -1,14 +1,30 @@ +# define a zone define shorewall::zone( - $type, - $options = '-', - $in = '-', - $out = '-', - $parent = '-', - $order = 100 + $type, + $options = '-', + $in = '-', + $out = '-', + $parent = '-', + $order = 100, ){ - $real_name = $parent ? { '-' => $name, default => "${name}:${parent}" } - shorewall::entry { "zones-${order}-${name}": - line => "${real_name} ${type} ${options} ${in} ${out}" + $real_name = $parent ? { '-' => $name, default => "${name}:${parent}" } + shorewall::entry { "zones-${order}-${name}": + line => "${real_name} ${type} ${options} ${in} ${out}", + shorewall => true, + shorewall6 => false, + } + if $shorewall::with_shorewall6 { + $type6 = $type ? { + 'ipv4' => 'ipv6', + 'ipsec' => 'ipsec6', + 'bport' => 'bport6', + default => $type, } + shorewall::entry { "zones-${order}-${name}_6": + line => "${real_name} ${type6} ${options} ${in} ${out}", + shorewall => false, + shorewall6 => true, + } + } } |