Merge branch 'jenkins' into 'master'

Jenkins

See merge request !2
This commit is contained in:
12ww1160
2017-08-03 15:10:00 +02:00
16 changed files with 377 additions and 46 deletions

View File

@@ -8,9 +8,19 @@ Changelog of Git Changelog.
<h2> No issue </h2> <h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/dc918f331ab225f">dc918f331ab225f</a> Arne Teuke <i>2017-08-03 11:01:32</i> <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/82035d505ca0352">82035d505ca0352</a> Arne Teuke <i>2017-08-03 12:13:00</i>
<p> <p>
<h3>initial commit</h3> <h3>added service control</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/423db4a35427180">423db4a35427180</a> Jenkins Server <i>2017-08-03 12:12:32</i>
<p>
<h3>recommit for updates in build 3</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/059e16bca627858">059e16bca627858</a> Arne Teuke <i>2017-08-03 12:07:42</i>
<p>
<h3>added service control</h3>
</p> </p>

View File

@@ -1,6 +1,6 @@
|Repo Name| version | Build Status| |Repo Name| version | Build Status|
|---|---|---|---| |---|---|---|---|
|`cd_fail2ban`| 0.0.0.2 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_fail2ban)](https://jenkins.confdroid.com/job/cd_fail2ban/)| |`cd_fail2ban`| 0.0.0.3 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_fail2ban)](https://jenkins.confdroid.com/job/cd_fail2ban/)|
### Synopsis ### Synopsis
Fail2Ban is an intrusion prevention software framework that protects computer servers from brute-force attacks. Fail2Ban is an intrusion prevention software framework that protects computer servers from brute-force attacks.
@@ -34,6 +34,7 @@ Fail2Ban is an intrusion prevention software framework that protects computer se
Installation Installation
* install required binaries * install required binaries
### Repo Structure ### Repo Structure
Repostructure has moved to REPOSTRUCTURE.md in repo. Repostructure has moved to REPOSTRUCTURE.md in repo.
@@ -78,6 +79,7 @@ There are currently no mandatory parameters, i.e. the module will function right
All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored. All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.
### Known Problems ### Known Problems
* firewalld: firewalld is auto-installed on CentOS7 as dependency of fail2ban by yum.
### Support ### Support
* OS: CentOS 6, 7 * OS: CentOS 6, 7

View File

@@ -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 |-- manifests
| |-- main | |-- main
| | |-- config.pp | | |-- config.pp
@@ -8,10 +31,14 @@
| | `-- service.pp | | `-- service.pp
| |-- init.pp | |-- init.pp
| `-- params.pp | `-- params.pp
|-- tests
| `-- UTF_Files
|-- CHANGELOG.md
|-- Gemfile |-- Gemfile
|-- Gemfile.lock |-- Gemfile.lock
|-- Jenkinsfile |-- Jenkinsfile
|-- LICENSE |-- LICENSE
`-- README.md |-- README.md
`-- REPOSTRUCTURE.md
2 directories, 12 files 7 directories, 34 files

View File

@@ -132,7 +132,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:29 2017 by Generated on Thu Aug 3 15:00:59 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build <p>|Repo Name| version | Build
Status| Status|
|---|---|---|---| |---|---|---|---|
|<code>cd_fail2ban</code>| 0.0.0.2 | <a |<code>cd_fail2ban</code>| 0.0.0.3 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_fail2ban">{Build href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_fail2ban">{Build
Status</a>/]|</p> Status</a>/]|</p>
@@ -184,6 +184,10 @@ right out of box as is.</p>
selinux is disabled, these contexts are ignored.</p> selinux is disabled, these contexts are ignored.</p>
<h3 id="label-Known+Problems">Known Problems</h3> <h3 id="label-Known+Problems">Known Problems</h3>
<ul><li>
<p>firewalld: firewalld is auto-installed on CentOS7 as dependency of fail2ban
by yum.</p>
</li></ul>
<h3 id="label-Support">Support</h3> <h3 id="label-Support">Support</h3>
<ul><li> <ul><li>
@@ -238,7 +242,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:30 2017 by Generated on Thu Aug 3 15:01:00 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build <p>|Repo Name| version | Build
Status| Status|
|---|---|---|---| |---|---|---|---|
|<code>cd_fail2ban</code>| 0.0.0.2 | <a |<code>cd_fail2ban</code>| 0.0.0.3 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_fail2ban">{Build href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_fail2ban">{Build
Status</a>/]|</p> Status</a>/]|</p>
@@ -184,6 +184,10 @@ right out of box as is.</p>
selinux is disabled, these contexts are ignored.</p> selinux is disabled, these contexts are ignored.</p>
<h3 id="label-Known+Problems">Known Problems</h3> <h3 id="label-Known+Problems">Known Problems</h3>
<ul><li>
<p>firewalld: firewalld is auto-installed on CentOS7 as dependency of fail2ban
by yum.</p>
</li></ul>
<h3 id="label-Support">Support</h3> <h3 id="label-Support">Support</h3>
<ul><li> <ul><li>
@@ -238,7 +242,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:29 2017 by Generated on Thu Aug 3 15:01:00 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -139,7 +139,7 @@ class cd_fail2ban {
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:30 2017 by Generated on Thu Aug 3 15:01:00 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -155,7 +155,7 @@ class cd_fail2ban::main::config (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:30 2017 by Generated on Thu Aug 3 15:01:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -86,24 +86,21 @@
<p>cd_fail2ban::main::dirs.pp <p>cd_fail2ban::main::dirs.pp
Module name: cd_fail2ban Module name: cd_fail2ban
Author: Arne Teuke Author: Arne Teuke
(arne_teuke@ConfDroid.com)</p> (arne_teuke@confdroid.com)
License:
This file is part of cd_fail2ban.</p>
<h1 id="label-License%3A">License:</h1> <p>cd_fail2ban is used for providing automatic configuration of Fail2Ban
<p>This file is part of cd_fail2ban.</p> Copyright (C) 2017 confdroid (copyright@confdroid.com)
This program is
<p>cd_fail2ban is used for providing automatic configuration of free software: you can redistribute it and/or modify
&lt;service / it under the terms of
purpose&gt; the GNU General Public License as published by
Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com) the Free Software
This Foundation, either version 3 of the License, or
program is free software: you can redistribute it and/or modify (at your option) any later
it under version.</p>
the terms of the GNU General Public License as published by
the Free
Software Foundation, either version 3 of the License, or
(at your option)
any later version.</p>
<p>This program is distributed in the hope that it will be useful, <p>This program is distributed in the hope that it will be useful,
but but
@@ -130,6 +127,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
<pre class="lines"> <pre class="lines">
23
24 24
25 25
26 26
@@ -138,10 +136,90 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
29 29
30 30
31 31
32</pre> 32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 24</span> <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 23</span>
class cd_fail2ban::main::dirs ( class cd_fail2ban::main::dirs (
@@ -149,8 +227,89 @@ class cd_fail2ban::main::dirs (
require cd_fail2ban::main::install require cd_fail2ban::main::install
# manage main dir
file { $fn_main_dir:
ensure =&gt; directory,
path =&gt; $fn_main_dir,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0755&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
}
# manage action.d dir
file { $fn_action_d_dir:
ensure =&gt; directory,
path =&gt; $fn_action_d_dir,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0755&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
}
# manage fail2ban.d dir
file { $fn_fail2ban_d_dir:
ensure =&gt; directory,
path =&gt; $fn_fail2ban_d_dir,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0755&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
}
# manage filter.d dir
file { $fn_filter_d_dir:
ensure =&gt; directory,
path =&gt; $fn_filter_d_dir,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0755&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
}
# manage jail.d dir
file { $fn_jail_d_dir:
ensure =&gt; directory,
path =&gt; $fn_jail_d_dir,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0755&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
}
# manage /var/lib/fail2ban
file { $fn_var_lib_dir:
ensure =&gt; directory,
path =&gt; $fn_var_lib_dir,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0755&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
}
}</pre> }</pre>
</td> </td>
</tr> </tr>
@@ -159,7 +318,7 @@ class cd_fail2ban::main::dirs (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:30 2017 by Generated on Thu Aug 3 15:01:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -152,7 +152,7 @@ class cd_fail2ban::main::files (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:30 2017 by Generated on Thu Aug 3 15:01:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -159,7 +159,7 @@ class cd_fail2ban::main::install (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:30 2017 by Generated on Thu Aug 3 15:01:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -164,7 +164,7 @@ class cd_fail2ban::main::service (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:30 2017 by Generated on Thu Aug 3 15:01:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -197,7 +197,22 @@ to choose, i.e. <code>latest</code> or <code>present</code>.</p>
44 44
45 45
46 46
47</pre> 47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 27</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 27</span>
@@ -212,11 +227,26 @@ $fn_enable_fail2ban = true,
# installation section # installation section
$reqpackages = $::operatingsystem ? { $reqpackages = $::operatingsystem ? {
/(?i-mx:centos|fedora|redhat)/ =&gt; [&#39;fail2ban&#39;], /(?i-mx:centos|fedora|redhat)/ =&gt; [&#39;fail2ban&#39;,&#39;fail2ban-firewalld&#39;,
&#39;fail2ban-sendmail&#39;,
&#39;fail2ban-server.noarch&#39;],
} }
# service # service
$fn_service = &#39;fail2ban&#39; $fn_service = &#39;fail2ban&#39;
# directories
$fn_main_dir = &#39;/etc/fail2ban&#39;
$fn_action_d_dir = &quot;${fn_main_dir}/action.d&quot;
$fn_fail2ban_d_dir = &quot;${fn_main_dir}/fail2ban.d&quot;
$fn_filter_d_dir = &quot;${fn_main_dir}/filter.d&quot;
$fn_jail_d_dir = &quot;${fn_main_dir}/jail.d&quot;
$fn_var_lib_dir = &#39;/var/lib/fail2ban&#39;
# files
# includes must be last # includes must be last
@@ -230,7 +260,7 @@ $fn_service = &#39;fail2ban&#39;
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:30 2017 by Generated on Thu Aug 3 15:01:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -90,7 +90,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Thu Aug 3 14:12:30 2017 by Generated on Thu Aug 3 15:01:00 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -1,12 +1,11 @@
## cd_fail2ban::main::dirs.pp ## cd_fail2ban::main::dirs.pp
# Module name: cd_fail2ban # Module name: cd_fail2ban
# Author: Arne Teuke (arne_teuke@ConfDroid.com) # Author: Arne Teuke (arne_teuke@confdroid.com)
# # License: # License:
# This file is part of cd_fail2ban. # This file is part of cd_fail2ban.
# #
# cd_fail2ban is used for providing automatic configuration of # cd_fail2ban is used for providing automatic configuration of Fail2Ban
# <service / purpose> # Copyright (C) 2017 confdroid (copyright@confdroid.com)
# Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com)
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or # the Free Software Foundation, either version 3 of the License, or
@@ -27,6 +26,87 @@ class cd_fail2ban::main::dirs (
require cd_fail2ban::main::install require cd_fail2ban::main::install
# manage main dir
file { $fn_main_dir:
ensure => directory,
path => $fn_main_dir,
owner => 'root',
group => 'root',
mode => '0755',
selrange => s0,
selrole => object_r,
seltype => etc_t,
seluser => system_u,
}
# manage action.d dir
file { $fn_action_d_dir:
ensure => directory,
path => $fn_action_d_dir,
owner => 'root',
group => 'root',
mode => '0755',
selrange => s0,
selrole => object_r,
seltype => etc_t,
seluser => system_u,
}
# manage fail2ban.d dir
file { $fn_fail2ban_d_dir:
ensure => directory,
path => $fn_fail2ban_d_dir,
owner => 'root',
group => 'root',
mode => '0755',
selrange => s0,
selrole => object_r,
seltype => etc_t,
seluser => system_u,
}
# manage filter.d dir
file { $fn_filter_d_dir:
ensure => directory,
path => $fn_filter_d_dir,
owner => 'root',
group => 'root',
mode => '0755',
selrange => s0,
selrole => object_r,
seltype => etc_t,
seluser => system_u,
}
# manage jail.d dir
file { $fn_jail_d_dir:
ensure => directory,
path => $fn_jail_d_dir,
owner => 'root',
group => 'root',
mode => '0755',
selrange => s0,
selrole => object_r,
seltype => etc_t,
seluser => system_u,
}
# manage /var/lib/fail2ban
file { $fn_var_lib_dir:
ensure => directory,
path => $fn_var_lib_dir,
owner => 'root',
group => 'root',
mode => '0755',
selrange => s0,
selrole => object_r,
seltype => etc_t,
seluser => system_u,
}
} }

View File

@@ -34,11 +34,26 @@ $fn_enable_fail2ban = true,
# installation section # installation section
$reqpackages = $::operatingsystem ? { $reqpackages = $::operatingsystem ? {
/(?i-mx:centos|fedora|redhat)/ => ['fail2ban'], /(?i-mx:centos|fedora|redhat)/ => ['fail2ban','fail2ban-firewalld',
'fail2ban-sendmail',
'fail2ban-server.noarch'],
} }
# service # service
$fn_service = 'fail2ban' $fn_service = 'fail2ban'
# directories
$fn_main_dir = '/etc/fail2ban'
$fn_action_d_dir = "${fn_main_dir}/action.d"
$fn_fail2ban_d_dir = "${fn_main_dir}/fail2ban.d"
$fn_filter_d_dir = "${fn_main_dir}/filter.d"
$fn_jail_d_dir = "${fn_main_dir}/jail.d"
$fn_var_lib_dir = '/var/lib/fail2ban'
# files
# includes must be last # includes must be last