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,20 +125,16 @@ 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,
proto =&gt; &#39;tcp&#39;,
dport =&gt; $hy_http_port,
jump =&gt; &#39;accept&#39;,
}
firewall { &quot;${hy_fw_order_no}${hy_https_port} tcp port ${hy_https_port}&quot;:
proto =&gt; &#39;tcp&#39;,
dport =&gt; $hy_https_port,
proto =&gt; &#39;tcp&#39;,
dport =&gt; $hy_https_port,
jump =&gt; &#39;accept&#39;,
}
}

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,32 +139,31 @@
class haproxy_cd::main::dirs (
) inherits haproxy_cd::params {
if $fqdn == $hy_host_fqdn {
require haproxy_cd::main::user
# main dir
file { $hy_main_dir:
ensure =&gt; directory,
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,
ensure =&gt; directory,
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,
}
# errors dir
file { $hy_errors_dir:
ensure =&gt; directory,
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,
ensure =&gt; directory,
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>

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,156 +261,153 @@
class haproxy_cd::main::files (
) inherits haproxy_cd::params {
if $fqdn == $hy_host_fqdn {
require haproxy_cd::main::dirs
# create the concat target
concat {$hy_main_config:
ensure =&gt; present,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0640&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
notify =&gt; Service[$hy_service],
concat { $hy_main_config:
ensure =&gt; present,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0640&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
notify =&gt; Service[$hy_service],
}
# create the header
concat::fragment { &#39;header&#39;:
target =&gt; $hy_main_config,
content =&gt; template($hy_config_head_erb),
order =&gt; &#39;001&#39;,
target =&gt; $hy_main_config,
content =&gt; template($hy_config_head_erb),
order =&gt; &#39;001&#39;,
}
# create the header
concat::fragment { &#39;tail&#39;:
target =&gt; $hy_main_config,
content =&gt; template($hy_config_tail_erb),
order =&gt; &#39;100&#39;,
target =&gt; $hy_main_config,
content =&gt; template($hy_config_tail_erb),
order =&gt; &#39;100&#39;,
}
# pid file
file { $hy_pid:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; haproxy_var_run_t,
seluser =&gt; system_u,
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; haproxy_var_run_t,
seluser =&gt; system_u,
}
# error files
file { $hy_400_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_400_erb),
notify =&gt; Service[$hy_service],
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_400_erb),
notify =&gt; Service[$hy_service],
}
file { $hy_403_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_403_erb),
notify =&gt; Service[$hy_service],
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_403_erb),
notify =&gt; Service[$hy_service],
}
file { $hy_408_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_408_erb),
notify =&gt; Service[$hy_service],
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_408_erb),
notify =&gt; Service[$hy_service],
}
file { $hy_500_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_500_erb),
notify =&gt; Service[$hy_service],
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_500_erb),
notify =&gt; Service[$hy_service],
}
file { $hy_502_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_502_erb),
notify =&gt; Service[$hy_service],
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_502_erb),
notify =&gt; Service[$hy_service],
}
file { $hy_503_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_503_erb),
notify =&gt; Service[$hy_service],
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_503_erb),
notify =&gt; Service[$hy_service],
}
file { $hy_504_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_504_erb),
notify =&gt; Service[$hy_service],
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($hy_504_erb),
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,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
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
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
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 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,19 +109,16 @@ 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:
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,26 +133,25 @@
class haproxy_cd::main::user (
) inherits haproxy_cd::params {
if $fqdn == $hy_host_fqdn {
require haproxy_cd::main::install
# manage user
user { $hy_user_name:
ensure =&gt; present,
name =&gt; $hy_user_name,
allowdupe =&gt; false,
comment =&gt; $hy_user_comment,
gid =&gt; $hy_user_name,
managehome =&gt; true,
home =&gt; $hy_user_home,
shell =&gt; $hy_user_shell,
ensure =&gt; present,
name =&gt; $hy_user_name,
allowdupe =&gt; false,
comment =&gt; $hy_user_comment,
gid =&gt; $hy_user_name,
managehome =&gt; true,
home =&gt; $hy_user_home,
shell =&gt; $hy_user_shell,
}
group { $hy_user_name:
ensure =&gt; present,
name =&gt; $hy_user_name,
allowdupe =&gt; false,
ensure =&gt; present,
name =&gt; $hy_user_name,
allowdupe =&gt; false,
}
}
}</pre>

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,37 +142,35 @@
class haproxy_cd::monitoring::fail2ban (
) inherits haproxy_cd::params {
if $hy_manage_fail2ban == true {
require cd_fail2ban
require fail2ban_cd # (external module)
# configure filter
file { &#39;/etc/fail2ban/filter.d/haproxy.conf&#39;:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template(&#39;haproxy_cd/fail2ban/f2b_haproxy.conf.erb&#39;),
notify =&gt; Service[&#39;fail2ban&#39;],
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template(&#39;haproxy_cd/fail2ban/f2b_haproxy.conf.erb&#39;),
notify =&gt; Service[&#39;fail2ban&#39;],
}
file { &#39;/etc/fail2ban/jail.d/010-haproxy.conf&#39;:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template(&#39;haproxy_cd/fail2ban/010_jail.d_haproxy.conf.erb&#39;),
notify =&gt; Service[&#39;fail2ban&#39;],
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template(&#39;haproxy_cd/fail2ban/010_jail.d_haproxy.conf.erb&#39;),
notify =&gt; Service[&#39;fail2ban&#39;],
}
}
}</pre>

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,16 +123,15 @@
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,
hasstatus =&gt; true,
hasrestart =&gt; true,
enable =&gt; true,
ensure =&gt; running,
hasstatus =&gt; true,
hasrestart =&gt; true,
enable =&gt; true,
}
}
}</pre>