diff options
| author | Micah Anderson <micah@riseup.net> | 2017-02-10 15:07:13 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-02-10 15:07:13 -0500 |
| commit | 4128f0735498964aef424ecdefbfc0f3c0f963db (patch) | |
| tree | d0a208ec8bad45455c3392a563c6b44f49b4dce9 | |
| parent | 334332c38f0044d54c1b7166f727bfa480cb0a84 (diff) | |
| parent | 054ccc9e8ee0a03e98165ee44f113ce7ccf3bc5c (diff) | |
Merge remote-tracking branch 'origin/master' into riseup
| -rw-r--r-- | lib/facter/shorewall_major_version.rb | 5 | ||||
| -rw-r--r-- | manifests/blrules.pp | 3 | ||||
| -rw-r--r-- | manifests/rule_section.pp | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/lib/facter/shorewall_major_version.rb b/lib/facter/shorewall_major_version.rb new file mode 100644 index 0000000..0068b48 --- /dev/null +++ b/lib/facter/shorewall_major_version.rb @@ -0,0 +1,5 @@ +Facter.add("shorewall_major_version") do + setcode do + Facter::Util::Resolution.exec('shorewall version').split('.').first || nil + end +end diff --git a/manifests/blrules.pp b/manifests/blrules.pp index 7f3953b..b8fe73f 100644 --- a/manifests/blrules.pp +++ b/manifests/blrules.pp @@ -18,7 +18,8 @@ # 'net all tcp 22', #ssh # ], # } -# + + class shorewall::blrules ( $whitelists, $drops, diff --git a/manifests/rule_section.pp b/manifests/rule_section.pp index 0a8b4bb..a576623 100644 --- a/manifests/rule_section.pp +++ b/manifests/rule_section.pp @@ -8,7 +8,7 @@ define shorewall::rule_section( $rule_section_prefix = '' } - shorewall::entry{"rules-${order}-${name}": - line => "${rule_section_prefix}SECTION ${name}", - } + shorewall::entry{"rules-${order}-${name}": + line => "${rule_section_prefix}SECTION ${name}", + } } |