From f35965e0d13c5a20213046f7facbfd609d418545 Mon Sep 17 00:00:00 2001 From: Lebedev Vadim Date: Wed, 29 Jun 2016 18:52:16 +0300 Subject: * fix rule section --- manifests/rule_section.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'manifests/rule_section.pp') diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp index 82984ca..3f2ecc5 100644 --- a/manifests/rule_section.pp +++ b/manifests/rule_section.pp @@ -1,7 +1,11 @@ define shorewall::rule_section( $order ){ + $rule_section_prefix = $shorewall_major_version ? { + '5' => '?' + } + shorewall::entry{"rules-${order}-${name}": - line => "SECTION ${name}", + line => "${rule_section_prefix}SECTION ${name}", } } -- cgit v1.2.3 From b6698ab18b4522a621d534a6e214219247ce3afc Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 13 Jan 2017 16:42:22 +0100 Subject: cherry pick fixes for 5.x Conflicts: manifests/rule_section.pp --- manifests/rule_section.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'manifests/rule_section.pp') 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}": -- cgit v1.2.3 From 50acce5dee1b76746f81d7c300913dd7d58021d4 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 13 Jan 2017 16:54:23 +0100 Subject: correct decision --- manifests/rule_section.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/rule_section.pp') diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp index 35e46b2..f5fa785 100644 --- a/manifests/rule_section.pp +++ b/manifests/rule_section.pp @@ -1,7 +1,7 @@ define shorewall::rule_section( $order ){ - if versioncmp($shorewall_major_version,'5') < 0 { + if versioncmp($shorewall_major_version,'4') > 0 { $rule_section_prefix = '?' } else { $rule_section_prefix = '' -- cgit v1.2.3