diff options
| author | mh <mh@immerda.ch> | 2017-01-12 11:29:28 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2017-01-12 11:29:28 +0100 |
| commit | 53fa57dbd5bd1ea0e8da5aaffe509df7a47d1730 (patch) | |
| tree | b8027acdad3a0013033210c6f95ebc2b50d42a0c /manifests/rule_section.pp | |
| parent | 8b20a24773e646a827f5bd9eb6030bfcbf12137d (diff) | |
| parent | 6d78d6c7b5c7617077260c94d7158b61f430494e (diff) | |
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'manifests/rule_section.pp')
| -rw-r--r-- | manifests/rule_section.pp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp index d853f70..08e5708 100644 --- a/manifests/rule_section.pp +++ b/manifests/rule_section.pp @@ -2,12 +2,11 @@ define shorewall::rule_section( $order ){ - if $::operatingsystem == 'CentOS' and versioncmp($::operatingsystemmajrelease,'6') > 0 { - $prefix = '?SECTION' - } else { - $prefix = 'SECTION' + $rule_section_prefix = $shorewall_major_version ? { + '5' => '?' } + shorewall::entry{"rules-${order}-${name}": - line => "${prefix} ${name}", + line => "${rule_section_prefix}SECTION ${name}", } } |