recommit for updates in build 10

This commit is contained in:
Jenkins ConfDroid
2020-06-07 14:41:55 +02:00
parent 4570ae53d9
commit ff469672a0
3 changed files with 79 additions and 12 deletions

View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/35043067cf4420c">35043067cf4420c</a> Jenkins ConfDroid <i>2019-04-10 18:43:58</i>
<p>
<h3>recommit for updates in build 4</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/3cb35499148764f">3cb35499148764f</a> Arne Teuke <i>2019-04-10 18:43:25</i>
<p>
<h3>removes firewall control</h3>
</p>
<a href="https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/85bf9610f328a1b">85bf9610f328a1b</a> Jenkins ConfDroid <i>2019-04-10 18:21:34</i>
<p>
<h3>recommit for updates in build 3</h3>

View File

@@ -126,7 +126,20 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
30
31
32
33</pre>
33
34
35
36
37
38
39
40
41
42
43
44
45
46</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 24</span>
@@ -137,8 +150,21 @@ class cd_fail2ban::main::install (
require cd_resources
package {$reqpackages:
ensure =&gt; $pkg_ensure,
if $::operatingsystemmajrelease != &#39;8&#39; {
package {$reqpackages:
ensure =&gt; $pkg_ensure,
}
}
if $::operatingsystemmajrelease == &#39;8&#39; {
package {$fn_extra_repo_url:
ensure =&gt; present,
}
package {$reqpackages:
ensure =&gt; $pkg_ensure,
require =&gt; Package[$fn_extra_repo_url],
}
}
}</pre>
</td>

View File

@@ -145,6 +145,26 @@ type</a> to choose, i.e. <code>latest</code> or <code>present</code>.</p>
</li>
<li>
<span class='name'>reqpackages</span>
<span class='type'>(<tt>array</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;fail2ban&#39;,&#39;fail2ban-firewalld&#39;,
&#39;fail2ban-sendmail&#39;,&#39;fail2ban-server.noarch&#39;,
&#39;whois&#39;]</tt>)</em>
&mdash;
<div class='inline'>
<p>the packages to install.</p>
</div>
</li>
<li>
<span class='name'>fn_manage_config</span>
@@ -837,6 +857,19 @@ log lines.</p>
<p>Choose default action.</p>
</div>
</li>
<li>
<span class='name'>fn_extra_repo_url</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;http://repo.okay.com.mx/centos/8/x86_64/release/okay-release-1-1.noarch.rpm&#39;</tt>)</em>
</li>
<li>
@@ -862,7 +895,6 @@ log lines.</p>
<pre class="lines">
121
122
123
124
@@ -961,11 +993,17 @@ log lines.</p>
217</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 121</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 122</span>
class cd_fail2ban::params (
# installation
$pkg_ensure = &#39;latest&#39;,
$reqpackages = [&#39;fail2ban&#39;,&#39;fail2ban-firewalld&#39;,
&#39;fail2ban-sendmail&#39;,&#39;fail2ban-server.noarch&#39;,
&#39;whois&#39;],
# urls
$fn_extra_repo_url = &#39;http://repo.okay.com.mx/centos/8/x86_64/release/okay-release-1-1.noarch.rpm&#39;,
$fn_manage_config = true,
$fn_enable_service = &#39;running&#39;,
@@ -1017,13 +1055,6 @@ $fn_default_action = &#39;action_&#39;,
) {
# installation section
$reqpackages = $::operatingsystem ? {
/(?i-mx:centos|fedora|redhat)/ =&gt; [&#39;fail2ban&#39;,&#39;fail2ban-firewalld&#39;,
&#39;fail2ban-sendmail&#39;,
&#39;fail2ban-server.noarch&#39;,&#39;whois&#39;],
}
$fn_jail_paths = $::operatingsystem ? {
/(?i-mx:centos|fedora|redhat)/ =&gt; &#39;fedora&#39;,
}