From ab94577ae7093a2a24b2b555f6750d00c74c690c Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 3 Aug 2017 15:01:03 +0200 Subject: [PATCH 1/7] recommit for updates in build 4 --- CHANGELOG.md | 14 +- REPOSTRUCTURE.md | 31 ++- doc/_index.html | 2 +- doc/file.README.html | 8 +- doc/index.html | 8 +- doc/puppet_classes/cd_fail2ban.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Adirs.html | 197 ++++++++++++++++-- .../cd_fail2ban_3A_3Amain_3A_3Afiles.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Aservice.html | 2 +- .../cd_fail2ban_3A_3Aparams.html | 38 +++- doc/top-level-namespace.html | 2 +- 13 files changed, 272 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 995f46c..da695c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,19 @@ Changelog of Git Changelog.

No issue

-dc918f331ab225f Arne Teuke 2017-08-03 11:01:32 +82035d505ca0352 Arne Teuke 2017-08-03 12:13:00

-

initial commit

+

added service control

+ +

+423db4a35427180 Jenkins Server 2017-08-03 12:12:32 +

+

recommit for updates in build 3

+ +

+059e16bca627858 Arne Teuke 2017-08-03 12:07:42 +

+

added service control

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index b032489..752e395 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -1,4 +1,27 @@ . +|-- doc +| |-- css +| | |-- common.css +| | |-- full_list.css +| | `-- style.css +| |-- js +| | |-- app.js +| | |-- full_list.js +| | `-- jquery.js +| |-- puppet_classes +| | |-- cd_fail2ban_3A_3Amain_3A_3Aconfig.html +| | |-- cd_fail2ban_3A_3Amain_3A_3Adirs.html +| | |-- cd_fail2ban_3A_3Amain_3A_3Afiles.html +| | |-- cd_fail2ban_3A_3Amain_3A_3Ainstall.html +| | |-- cd_fail2ban_3A_3Amain_3A_3Aservice.html +| | |-- cd_fail2ban_3A_3Aparams.html +| | `-- cd_fail2ban.html +| |-- file.README.html +| |-- frames.html +| |-- _index.html +| |-- index.html +| |-- puppet_class_list.html +| `-- top-level-namespace.html |-- manifests | |-- main | | |-- config.pp @@ -8,10 +31,14 @@ | | `-- service.pp | |-- init.pp | `-- params.pp +|-- tests +| `-- UTF_Files +|-- CHANGELOG.md |-- Gemfile |-- Gemfile.lock |-- Jenkinsfile |-- LICENSE -`-- README.md +|-- README.md +`-- REPOSTRUCTURE.md -2 directories, 12 files +7 directories, 34 files diff --git a/doc/_index.html b/doc/_index.html index efa3534..b999eaa 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -132,7 +132,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 58369d3..70fc01a 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_fail2ban| 0.0.0.2 | cd_fail2ban| 0.0.0.3 | {Build Status/]|

@@ -184,6 +184,10 @@ right out of box as is.

selinux is disabled, these contexts are ignored.

Known Problems

+

Support

@@ -724,23 +932,6 @@ href="https://tools.ietf.org/html/rfc7231#section-5.5.3">tools.ietf.org/html/rfc 
 
 
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
 121
 122
 123
@@ -804,47 +995,92 @@ href="https://tools.ietf.org/html/rfc7231#section-5.5.3">tools.ietf.org/html/rfc
 181
 182
 183
-184
+184 +185 +186 +187 +188 +189 +190 +191 +192 +193 +194 +195 +196 +197 +198 +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +210 +211 +212 +213 +214 +215 - 
# File 'manifests/params.pp', line 104
+        
# File 'manifests/params.pp', line 121
 
 class cd_fail2ban::params (
 
-$pkg_ensure             = 'latest',
+$pkg_ensure                 = 'latest',
 
-$fn_manage_config       = true,
-$fn_enable_service      = 'running',
+$fn_manage_config           = true,
+$fn_enable_service          = 'running',
 
 # fail2ban.conf/local
 
-$fn_loglevel            = 'INFO',
-$fn_logtarget           = 'SYSLOG',
-$fn_syslogsocket        = 'auto',
-$fn_socket              = '/var/run/fail2ban/fail2ban.sock',
-$fn_pidfile             = '/var/run/fail2ban/fail2ban.pid',
-$fn_dbfile              = '/var/lib/fail2ban/fail2ban.sqlite3',
-$fn_dbpurgeage          = '86400',
+$fn_loglevel                = 'INFO',
+$fn_logtarget               = 'SYSLOG',
+$fn_syslogsocket            = 'auto',
+$fn_socket                  = '/var/run/fail2ban/fail2ban.sock',
+$fn_pidfile                 = '/var/run/fail2ban/fail2ban.pid',
+$fn_dbfile                  = '/var/lib/fail2ban/fail2ban.sqlite3',
+$fn_dbpurgeage              = '86400',
 
 # jail.conf/local
-$fn_ignoreip            = '127.0.0.1/8',
-$fn_ignorecommand       = '',
-$fn_bantime             = '600',
-$fn_findtime            = '600',
-$fn_maxretry            = '5',
-$fn_backend             = 'auto',
-$fn_usedns              = 'warn',
-$fn_logencoding         = 'auto',
-$fn_enabled             = 'false',
-$fn_filter              = '%(__name__)s',
-$fn_destemail           = 'root@localhost',
-$fn_sender              = 'root@localhost',
-$fn_mta                 = 'sendmail',
-$fn_protocol            = 'tcp',
-$fn_chain               = 'INPUT',
-$fn_port                = '0:65535',
-$fn_fail2ban_agent      = 'Fail2Ban/%(fail2ban_version)s',
-
+$fn_ignoreip                = '127.0.0.1/8',
+$fn_ignorecommand           = '',
+$fn_bantime                 = '600',
+$fn_findtime                = '600',
+$fn_maxretry                = '5',
+$fn_backend                 = 'auto',
+$fn_usedns                  = 'warn',
+$fn_logencoding             = 'auto',
+$fn_enabled                 = false,
+$fn_filter                  = '%(__name__)s',
+$fn_destemail               = 'root@localhost',
+$fn_sender                  = 'root@localhost',
+$fn_mta                     = 'sendmail',
+$fn_protocol                = 'tcp',
+$fn_chain                   = 'INPUT',
+$fn_port                    = '0:65535',
+$fn_fail2ban_agent          = 'Fail2Ban/%(fail2ban_version)s',
+$fn_banaction               = 'iptables-multiport',
+$fn_banaction_allports      = 'iptables-allports',
+$fn_action_                 = '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]',
+$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"]',
+$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"]',
+$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"]',
+$fn_action_cf_mwl           = 'cloudflare[cfuser="%(cfemail)s", cftoken="%(cfapikey)s"]
+                        %(mta)s-whois-lines[name=%(__name__)s, sender="%(sender)s", dest="%(destemail)s", logpath=%(logpath)s, chain="%(chain)s"]',
+$fn_action_blocklist_de     = 'blocklist_de[email="%(sender)s", service=%(filter)s, apikey="%(blocklist_de_apikey)s", agent="%(fail2ban_agent)s"]',
+$fn_action_badips           = 'badips.py[category="%(__name__)s", banaction="%(banaction)s", agent="%(fail2ban_agent)s"]',
+$fn_action_badips_report    = 'badips[category="%(__name__)s", agent="%(fail2ban_agent)s"]',
+$fn_default_action          = 'action_',
 
 ) {
 
@@ -897,7 +1133,7 @@ $fn_jail_local_erb      = 'cd_fail2ban/jail_local.erb'
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 136fa21..f69125f 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@