recommit for updates in build 3

This commit is contained in:
Jenkins ConfDroid
2025-03-02 17:36:33 +01:00
parent cecbd6cfc1
commit 4132353fd7
10 changed files with 359 additions and 357 deletions

View File

@@ -117,11 +117,7 @@ Teuke (arne_teuke@confdroid.com)</p>
19
20
21
22
23
24
25
26</pre>
22</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
@@ -129,11 +125,7 @@ Teuke (arne_teuke@confdroid.com)</p>
class haproxy_cd::firewall::iptables (
) inherits haproxy_cd::params {
if ($fqdn == $hy_host_fqdn) and ($hy_manage_fw == true) {
require haproxy_cd::main::files
firewall { &quot;${hy_fw_order_no}${hy_http_port} tcp port ${hy_http_port}&quot;:
proto =&gt; &#39;tcp&#39;,
dport =&gt; $hy_http_port,

View File

@@ -77,8 +77,7 @@
</div>
<h2>Summary</h2>
Class manages all aspects of configuring the module logic for
haproxy_cd.
Class manages module logic for haproxy_cd.
<h2>Overview</h2>
<div class="docstring">
@@ -102,6 +101,7 @@ haproxy_cd.
<pre class="lines">
6
7
8
9
@@ -109,25 +109,18 @@ haproxy_cd.
11
12
13
14
15
16
17
18</pre>
14</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 7</span>
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
class haproxy_cd::main::config (
) inherits haproxy_cd::params {
include haproxy_cd::server::service
if $hy_manage_fail2ban == true {
include haproxy_cd::monitoring::fail2ban
}
}</pre>
</td>

View File

@@ -131,8 +131,7 @@
33
34
35
36
37</pre>
36</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -140,7 +139,6 @@
class haproxy_cd::main::dirs (
) inherits haproxy_cd::params {
if $fqdn == $hy_host_fqdn {
require haproxy_cd::main::user

View File

@@ -253,10 +253,7 @@
155
156
157
158
159
160
161</pre>
158</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -264,7 +261,6 @@
class haproxy_cd::main::files (
) inherits haproxy_cd::params {
if $fqdn == $hy_host_fqdn {
require haproxy_cd::main::dirs
@@ -288,7 +284,6 @@ class haproxy_cd::main::files (
order =&gt; &#39;001&#39;,
}
# create the header
concat::fragment { &#39;tail&#39;:
target =&gt; $hy_main_config,
@@ -296,7 +291,6 @@ class haproxy_cd::main::files (
order =&gt; &#39;100&#39;,
}
# pid file
file { $hy_pid:
ensure =&gt; file,
@@ -401,7 +395,7 @@ class haproxy_cd::main::files (
notify =&gt; Service[$hy_service],
}
# make sure rsyslog is logging haproxy logs
# make sure syslog is logging haproxy logs
file { &#39;/etc/rsyslog.d/10-haproxy.conf&#39;:
ensure =&gt; file,
@@ -413,7 +407,7 @@ class haproxy_cd::main::files (
seltype =&gt; syslog_conf_t,
seluser =&gt; system_u,
content =&gt; template(&#39;haproxy_cd/rsyslog/10_haproxy.conf.erb&#39;),
# notify =&gt; Service[&#39;rsyslog&#39;], # only if using cd_rsyslog
# notify =&gt; Service[&#39;rsyslog&#39;], # only if using rsyslog_cd module
}
}
}</pre>

View File

@@ -77,8 +77,7 @@
</div>
<h2>Summary</h2>
Class manage all aspects of installing binaries required for
haproxy_cd
Class installs binaries required for haproxy_cd
<h2>Overview</h2>
<div class="docstring">
@@ -102,6 +101,7 @@ haproxy_cd
<pre class="lines">
6
7
8
9
@@ -109,17 +109,14 @@ haproxy_cd
11
12
13
14
15
16</pre>
14</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 7</span>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
class haproxy_cd::main::install (
) inherits haproxy_cd::params {
if $fqdn == $hy_host_fqdn {
package { $reqpackages:
ensure =&gt; $pkg_ensure,

View File

@@ -125,8 +125,7 @@
27
28
29
30
31</pre>
30</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/user.pp', line 6</span>
@@ -134,7 +133,6 @@
class haproxy_cd::main::user (
) inherits haproxy_cd::params {
if $fqdn == $hy_host_fqdn {
require haproxy_cd::main::install

View File

@@ -134,9 +134,7 @@
36
37
38
39
40
41</pre>
39</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/monitoring/fail2ban.pp', line 5</span>
@@ -144,10 +142,8 @@
class haproxy_cd::monitoring::fail2ban (
) inherits haproxy_cd::params {
if $hy_manage_fail2ban == true {
require cd_fail2ban
require fail2ban_cd # (external module)
# configure filter

View File

@@ -1131,7 +1131,9 @@ succeed.</p>
158
159
160
161</pre>
161
162
163</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 76</span>
@@ -1193,6 +1195,8 @@ class haproxy_cd::params (
String $hy_be_userlist = &#39;####&#39;,
) {
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
# service
$hy_service = &#39;haproxy&#39;

View File

@@ -115,8 +115,7 @@
17
18
19
20
21</pre>
20</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -124,10 +123,9 @@
class haproxy_cd::server::service (
) inherits haproxy_cd::params {
if $fqdn == $hy_host_fqdn {
require haproxy_cd::firewall::iptables
require haproxy_cd::main::files
service { $hy_service:
ensure =&gt; running,

View File

@@ -92,7 +92,7 @@
<span class='name'>haproxy_fqdn</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
@@ -110,7 +110,7 @@
<span class='name'>frontend_name</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
@@ -128,7 +128,7 @@
<span class='name'>frontend_order</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;010&#39;</tt>)</em>
@@ -136,7 +136,7 @@
&mdash;
<div class='inline'>
<p>the order where the concat should appear in the file.</p>
<p>where the concat should appear in the file.</p>
</div>
</li>
@@ -146,7 +146,7 @@
<span class='name'>frontend_mode</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
@@ -164,7 +164,7 @@
<span class='name'>fe_use_backend</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
@@ -182,7 +182,7 @@
<span class='name'>fe_bind_mode</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
@@ -190,40 +190,7 @@
&mdash;
<div class='inline'>
<p>which bind mode to use, i.e. to which interface and poort to bind.</p>
</div>
</li>
<li>
<span class='name'>acl_rule</span>
<span class='type'>(<tt>string</tt>)</span>
&mdash;
<div class='inline'>
<p>an ACL rule to be inserted if required. Empty values will not be populated.</p>
</div>
</li>
<li>
<span class='name'>acl_order</span>
<span class='type'>(<tt>string</tt>)</span>
&mdash;
<div class='inline'>
<p>the order where the acl rule should be inserted, so it will be within the
correct lb instance configuration.</p>
<p>which bind mode to use, i.e. to which interface and port to bind.</p>
</div>
</li>
@@ -233,7 +200,7 @@ correct lb instance configuration.</p>
<span class='name'>backend_name</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
@@ -251,7 +218,7 @@ correct lb instance configuration.</p>
<span class='name'>backend_order</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;030&#39;</tt>)</em>
@@ -270,7 +237,7 @@ instance configuration.</p>
<span class='name'>fe_maxconn</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
@@ -288,7 +255,7 @@ instance configuration.</p>
<span class='name'>be_server_name</span>
<span class='type'>(<tt>string</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
@@ -299,45 +266,6 @@ instance configuration.</p>
<p>set the name for the backend server</p>
</div>
</li>
<li>
<span class='name'>fe_option</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
</li>
<li>
<span class='name'>acl_rule_front</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
</li>
<li>
<span class='name'>acl_rule_back</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
</li>
<li>
@@ -345,12 +273,17 @@ instance configuration.</p>
<span class='name'>be_balance</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>what kind of balance should be used</p>
</div>
</li>
<li>
@@ -358,12 +291,17 @@ instance configuration.</p>
<span class='name'>be_mode</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>which backend mode should be used</p>
</div>
</li>
<li>
@@ -371,12 +309,17 @@ instance configuration.</p>
<span class='name'>default_backend</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for the default backend</p>
</div>
</li>
<li>
@@ -384,12 +327,17 @@ instance configuration.</p>
<span class='name'>be_option</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for a backend option</p>
</div>
</li>
<li>
@@ -397,12 +345,17 @@ instance configuration.</p>
<span class='name'>fe_tcp_request</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for a frontend tcp request</p>
</div>
</li>
<li>
@@ -410,12 +363,71 @@ instance configuration.</p>
<span class='name'>fe_http_request</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for a frontend http request</p>
</div>
</li>
<li>
<span class='name'>fe_option</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for a frontend option</p>
</div>
</li>
<li>
<span class='name'>acl_rule_front</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for a frontend acl rule</p>
</div>
</li>
<li>
<span class='name'>acl_rule_back</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for a backend acl rule</p>
</div>
</li>
<li>
@@ -423,12 +435,17 @@ instance configuration.</p>
<span class='name'>backend_configs</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>[]</tt>)</em>
&mdash;
<div class='inline'>
<p>array of values for the backend</p>
</div>
</li>
<li>
@@ -436,12 +453,17 @@ instance configuration.</p>
<span class='name'>be_stick_table</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for the backend stickiness</p>
</div>
</li>
<li>
@@ -449,12 +471,17 @@ instance configuration.</p>
<span class='name'>be_stick_on</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for th backend stickiness</p>
</div>
</li>
<li>
@@ -462,12 +489,17 @@ instance configuration.</p>
<span class='name'>be_http_check</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for backend http check</p>
</div>
</li>
<li>
@@ -475,12 +507,17 @@ instance configuration.</p>
<span class='name'>be_http_request</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for a backend http request</p>
</div>
</li>
<li>
@@ -488,12 +525,17 @@ instance configuration.</p>
<span class='name'>be_acl_rule</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>value for a backend acl rule</p>
</div>
</li>
</ul>
@@ -507,16 +549,6 @@ instance configuration.</p>
<pre class="lines">
24
25
26
27
28
29
30
31
32
33
34
35
36
@@ -572,48 +604,50 @@ instance configuration.</p>
86
87
88
89</pre>
89
90
91
92
93
94</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 24</span>
<pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 34</span>
define haproxy_cd::server::proxy (
$haproxy_fqdn = undef,
$frontend_name = undef,
$frontend_mode = undef,
$fe_use_backend = &#39;&#39;,
$fe_bind_mode = undef,
$fe_option = &#39;&#39;,
$frontend_order = &#39;010&#39;,
$acl_rule_front = &#39;&#39;,
$acl_rule_back = &#39;&#39;,
$backend_name = &#39;&#39;,
$backend_order = &#39;030&#39;,
$fe_maxconn = &#39;&#39;,
$be_server_name = &#39;&#39;,
$be_balance = &#39;&#39;,
$be_mode = &#39;&#39;,
$default_backend = &#39;&#39;,
$be_option = &#39;&#39;,
$fe_tcp_request = &#39;&#39;,
$fe_http_request = &#39;&#39;,
$backend_configs = [],
$be_stick_table = &#39;&#39;,
$be_stick_on = &#39;&#39;,
$be_http_check = &#39;&#39;,
$be_http_request = &#39;&#39;,
$be_acl_rule = &#39;&#39;,
String $haproxy_fqdn = undef,
String $frontend_name = undef,
String $frontend_mode = undef,
String $fe_use_backend = &#39;&#39;,
String $fe_bind_mode = undef,
String $fe_option = &#39;&#39;,
String $frontend_order = &#39;010&#39;,
String $acl_rule_front = &#39;&#39;,
String $acl_rule_back = &#39;&#39;,
String $backend_name = &#39;&#39;,
String $backend_order = &#39;030&#39;,
String $fe_maxconn = &#39;&#39;,
String $be_server_name = &#39;&#39;,
String $be_balance = &#39;&#39;,
String $be_mode = &#39;&#39;,
String $default_backend = &#39;&#39;,
String $be_option = &#39;&#39;,
String $fe_tcp_request = &#39;&#39;,
String $fe_http_request = &#39;&#39;,
Array $backend_configs = [],
String $be_stick_table = &#39;&#39;,
String $be_stick_on = &#39;&#39;,
String $be_http_check = &#39;&#39;,
String $be_http_request = &#39;&#39;,
String $be_acl_rule = &#39;&#39;,
) {
$hy_main_config = &#39;/etc/haproxy/haproxy.cfg&#39;
$hy_frontendrule = &#39;haproxy_cd/haproxy_frontend_rule.erb&#39;
$hy_backendrule = &#39;haproxy_cd/haproxy_backend_rule.erb&#39;
$hy_acl_rule = &#39;haproxy_cd/haproxy_acl_rule.erb&#39;
# Ensure acl_rule_front and acl_rule_back are arrays
$acl_rule_front_array = split($acl_rule_front, &#39;;&#39;)
$acl_rule_back_array = split($acl_rule_back, &#39;;&#39;)
@@ -639,9 +673,7 @@ define haproxy_cd::server::proxy (
&#39;order&#39; =&gt; $backend_order,
})
# open sepcific firewall ports
# open specific firewall ports
}</pre>
</td>
</tr>