diff options
| author | intrigeri <intrigeri@boum.org> | 2018-04-05 09:13:13 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2018-04-05 09:13:13 +0000 |
| commit | 0bbd20b803b90acc55bd6d52239c11c0e87d2dad (patch) | |
| tree | 59033495b20af4afac47df8d013bf3703a291a1f | |
| parent | cba722d36a8bbd0bb5ce035228e7983ca48855a1 (diff) | |
| parent | 37bb199434a193dbcd2ad8e42bc5cb024718b884 (diff) | |
Merge branch 'SECTION' into 'master'
This fixes the ?SECTION change.
See merge request shared-puppet-modules-group/shorewall!14
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | manifests/rule_section.pp | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -84,7 +84,6 @@ the following: * the rfc1918 file and norfc1918 option are deprecated * the tcrules file is deprecated, replaced by mangled * the routestopped file is deprecated and replaced by stoppedrules -* as of shorewall 4.6.0, SECTION headers need a leading '?' You should migrate your own calls to this module to move to the currently supported methods, we will be dropping support for deprecated features as diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp index 24b3dfb..620af89 100644 --- a/manifests/rule_section.pp +++ b/manifests/rule_section.pp @@ -2,7 +2,7 @@ define shorewall::rule_section( $order, ){ - if versioncmp($shorewall_major_version,'4') > 0 { + if versioncmp($shorewall_version,'4.6.0') > 0 { $rule_section_prefix = '?' } else { $rule_section_prefix = '' |