diff options
| author | mh <mh@immerda.ch> | 2017-01-13 16:42:22 +0100 |
|---|---|---|
| committer | Matt Taggart <taggart@riseup.net> | 2017-02-09 15:04:45 -0800 |
| commit | b6698ab18b4522a621d534a6e214219247ce3afc (patch) | |
| tree | bbe997b80a13332f4d1d383ec956bba0981c6373 | |
| parent | e6a2b00207b0ec495b81e44e8d90acffcf1bb166 (diff) | |
cherry pick fixes for 5.x
Conflicts:
manifests/rule_section.pp
| -rw-r--r-- | manifests/rule_section.pp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp index 3f2ecc5..35e46b2 100644 --- a/manifests/rule_section.pp +++ b/manifests/rule_section.pp @@ -1,8 +1,10 @@ define shorewall::rule_section( $order ){ - $rule_section_prefix = $shorewall_major_version ? { - '5' => '?' + if versioncmp($shorewall_major_version,'5') < 0 { + $rule_section_prefix = '?' + } else { + $rule_section_prefix = '' } shorewall::entry{"rules-${order}-${name}": |