diff --git a/README.md b/README.md index 952e5cd..fc0d7aa 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ node 'example.example.net' { - through Foreman: -In order to apply parameters through Foreman, **__confdroid_fail2ban::params__** must be added to the host or host group in question. +In order to apply parameters through Foreman, **confdroid_fail2ban::params** must be added to the host or host group in question. See [more details about class deployment on Confdroid.com](https://confdroid.com/2017/05/deploying-our-puppet-modules/). diff --git a/manifests/params.pp b/manifests/params.pp index a6a0556..012ae00 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -123,7 +123,7 @@ class confdroid_fail2ban::params ( # jail.conf/local String $fn_ignoreip = '127.0.0.1/8', - Optional[String] $fn_ignorecommand = '', + Optional[String] $fn_ignorecommand = undef, String $fn_bantime = '600', String $fn_findtime = '600', String $fn_maxretry = '5', @@ -133,6 +133,7 @@ class confdroid_fail2ban::params ( Boolean $fn_enabled = false, String $fn_filter = '%(__name__)s', String $fn_destemail = 'root@localhost', + #String $fn_sender = "fail2ban@${fqdn}", String $fn_mta = 'sendmail', String $fn_protocol = 'tcp', String $fn_chain = 'INPUT', @@ -143,7 +144,7 @@ class confdroid_fail2ban::params ( String $fn_action_ = '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]', String $fn_action_mw = '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"] %(mta)s-whois[name=%(__name__)s, sender="%(sender)s", dest="%(destemail)s", protocol="%(protocol)s", chain="%(chain)s"]', - String $fn_action_mwl = '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]' + String $fn_action_mwl = '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"] %(mta)s-whois-lines[name=%(__name__)s, sender="%(sender)s", dest="%(destemail)s", logpath=%(logpath)s, chain="%(chain)s"]', String $fn_action_xarf = '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"] xarf-login-attack[service=%(__name__)s, sender="%(sender)s", logpath=%(logpath)s, port="%(port)s"]',