Make before setting in jail.conf configurable
#68
Conversation
|
Fixed the failing tests |
bastelfreak
added
needs-rebase
and removed
enhancement
|
Hi @arjenz, can you please rebase against our latest master branch? |
|
@bastelfreak Done :) |
bastelfreak
added
enhancement
manifests/init.pp
Outdated
| @@ -15,6 +15,7 @@ | |||
| String $config_file_owner = $::fail2ban::params::config_file_owner, | |||
| String $config_file_group = $::fail2ban::params::config_file_group, | |||
| String $config_file_mode = $::fail2ban::params::config_file_mode, | |||
| String $config_file_before = $::fail2ban::params::before_file, | |||
There was a problem hiding this comment.
Can you please use String[1]? This ensures people don't provide an empty string.
manifests/params.pp
Outdated
| @@ -41,6 +41,12 @@ | |||
| default => 'Package[fail2ban]', | |||
| } | |||
|
|
|||
| $before_file = $::osfamily ? { | |||
There was a problem hiding this comment.
please use $facts['os']['family'] instead. The new facts hash is preferred to access facts.
manifests/params.pp
Outdated
| @@ -41,6 +41,12 @@ | |||
| default => 'Package[fail2ban]', | |||
| } | |||
|
|
|||
| $before_file = $::osfamily ? { | |||
| 'Debian' => 'paths-debian.conf', | |||
There was a problem hiding this comment.
awesome that you use a selector here to determine the value for $before_file. That is the right way to go, but rarely used.
| @@ -19,7 +19,7 @@ | |||
|
|
|||
| [INCLUDES] | |||
|
|
|||
| before = paths-fedora.conf | |||
| before = <%= scope['::fail2ban::before_file'] %> | |||
There was a problem hiding this comment.
please mind that this is now an epp template and variables are accessed in a different way:
https://puppet.com/docs/puppet/5.5/lang_template_epp.html
arjenz
force-pushed
the
before_file
branch
4 times, most recently
from
91b4748
to
69fcaea
Compare
|
@bastelfreak Done, I think :) |
"before" File is called 'paths-debian.conf' on osfamily Debian, add this setting to params, init and template.
Don't allow empty string as parameter values.
|
@bastelfreak Anything else I can do? :) |
|
looks good, thanks! |
"before" File is called 'paths-debian.conf' on osfamily Debian, add this setting to params, init and template.
Pull Request (PR) description
Account for different filenames on different operating systems fore the "before" include in jails.conf
This Pull Request (PR) fixes the following issues