Recommit for updates in build 25

This commit is contained in:
Jenkins Server
2026-02-14 15:42:45 +01:00
parent d5dfe3bbbc
commit da716a4d81
5 changed files with 334 additions and 12 deletions

View File

@@ -79,6 +79,8 @@
<span class='object_link'><a href="confdroid_nagios_3A_3Aclient_3A_3Atarget.html" title="puppet_classes::confdroid_nagios::client::target (puppet_class)">confdroid_nagios::client::target</a></span><br/>
<span class='object_link'><a href="confdroid_nagios_3A_3Aserver_3A_3Anagios.html" title="puppet_classes::confdroid_nagios::server::nagios (puppet_class)">confdroid_nagios::server::nagios</a></span><br/>
<span class='object_link'><a href="confdroid_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_nagios::server::service (puppet_class)">confdroid_nagios::server::service</a></span><br/>
</dd>
@@ -305,6 +307,24 @@ inherited by all classes except defines.
&mdash;
<div class='inline'>
<p>Whether to include the NRPE client on the Nagios clients. Default is true.</p>
</div>
</li>
<li>
<span class='name'>ng_use_https</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to configure the Nagios web interface to use HTTPS. Default is false. We recommend using a reverse proxy with SSL termination in front of the Nagios web interface, so this is disabled by default.</p>
</div>
</li>
@@ -320,10 +340,6 @@ inherited by all classes except defines.
<pre class="lines">
26
27
28
29
30
31
32
@@ -365,10 +381,88 @@ inherited by all classes except defines.
68
69
70
71</pre>
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
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 26</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 30</span>
class confdroid_nagios::params (
@@ -387,6 +481,9 @@ class confdroid_nagios::params (
String $ng_u_home = &#39;/home/nagios&#39;,
Integer $ng_u_uid = 1004,
# httpd
Boolean $ng_use_https = false,
) {
# Default facts
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
@@ -413,6 +510,77 @@ class confdroid_nagios::params (
$ng_cmd_dir = &quot;${ng_spool_dir}/cmd&quot;
$ng_checkresults_dir = &quot;${ng_spool_dir}/checkresults&quot;
# files
$ng_nagios_cfg_file = &quot;${ng_main_dir}/nagios.cfg&quot;
$ng_nagios_cfg_erb = &#39;confdroid_nagios/nagios/nagios_cfg.erb&#39;
## old
$ng_main_config = &quot;${ng_main_dir}/nagios.cfg&quot;
$ng_cgi_cfg_file = &quot;${ng_main_dir}/cgi.cfg&quot;
$ng_cgi_cfg_erb = &#39;confdroid_nagios/nagios/cgi_cfg.erb&#39;
$ng_htpasswd_file = &quot;${ng_main_dir}/passwd&quot;
$ng_htpasswd_head = &#39;confdroid_nagios/nagios/htpasswd_head.erb&#39;
$ng_htpasswd_rule = &#39;confdroid_nagios/nagios/htpasswd_rule.erb&#39;
$ng_taccgi_erb = &#39;confdroid_nagios/selinux/taccgi.erb&#39;
$ng_statcgi_erb = &#39;confdroid_nagios/selinux/statuscgi.erb&#39;
$ng_statdat_erb = &#39;confdroid_nagios/selinux/statusdat.erb&#39;
$ng_checknrpe_erb = &#39;confdroid_nagios/selinux/checknrpe.erb&#39;
$ng_checknagios_erb = &#39;confdroid_nagios/selinux/checknagios.erb&#39;
$ng_nagios_conf = &#39;/etc/httpd/conf.d/nagios.conf&#39;
$ng_nagios_conf_erb = &#39;confdroid_nagios/httpd/nagios_conf.erb&#39;
$ng_welcome_conf = &#39;/etc/httpd/conf.d/welcome.conf&#39;
$ng_welcome_conf_erb = &#39;confdroid_nagios/httpd/welcome_conf.erb&#39;
$ng_forward_conf = &#39;/etc/httpd/conf.d/nagios_forward.conf&#39;
$ng_forward_conf_erb = &#39;confdroid_nagios/httpd/forward_conf.erb&#39;
$ng_get_cert_erb = &#39;confdroid_nagios/certbot/get_cert.erb&#39;
$ng_unless_get_cert = &#39;confdroid_nagios/certbot/unless_get_cert.erb&#39;
$ng_unless_renew_erb = &#39;confdroid_nagios/certbot/unless_renew_cert.erb&#39;
$ng_index_html_file = &#39;/var/www/html/index.html&#39;
$ng_index_html_erb = &#39;confdroid_nagios/httpd/index_html.erb&#39;
$ng_ssl_vhost_file = &#39;/etc/httpd/conf.d/nagios_ssl.conf&#39;
$ng_ssl_vhost_erb = &#39;confdroid_nagios/httpd/nagios_ssl_vhost.erb&#39;
$ng_resource_erb = &#39;confdroid_nagios/nagios/resource_cfg.erb&#39;
$ng_grep_erb = &#39;confdroid_nagios/selinux/grep.erb&#39;
# certbot
$ng_certbot_main_dir = &#39;/etc/letsencrypt&#39;
$ng_certbot_archive = &quot;${ng_certbot_main_dir}/archive&quot;
$ng_certbot_check = &quot;${ng_certbot_archive}/${ng_webserver_name}/cert1.pem&quot;
$ng_certbot_live = &quot;${ng_certbot_main_dir}/live&quot;
# nagios
$ng_target_templates = &quot;${ng_conf_d_dir}/nagios_templates.cfg&quot;
$ng_templates_head_erb = &#39;confdroid_nagios/nagios/templates_cfg_head.erb&#39;
$ng_templates_rule_erb = &#39;confdroid_nagios/nagios/templates_cfg_rule.erb&#39;
$ng_tgt_timeperiods_base = &quot;${ng_conf_d_dir}/nagios_timeperiods.cfg&quot;
$ng_tgt_timep_add = &quot;${ng_conf_d_dir}/nagios_timeperiods_add.cfg&quot;
$ng_tgt_timep_head_erb = &#39;confdroid_nagios/nagios/timeperiods_cfg_head.erb&#39;
$ng_tgt_timep_rule_erb = &#39;confdroid_nagios/nagios/timeperiods_cfg_rule.erb&#39;
$ng_target_localhost = &quot;${ng_conf_d_dir}/nagios_localhost.cfg&quot;
$ng_target_host = &quot;${ng_conf_d_dir}/nagios_host.cfg&quot;
$ng_target_hostgroup_base = &quot;${ng_conf_d_dir}/nagios_hostgroups_base.cfg&quot;
$ng_tgt_hostgroup_add = &quot;${ng_conf_d_dir}/nagios_hostgroups_add.cfg&quot;
$ng_tgt_hostgrp_head_erb = &#39;confdroid_nagios/nagios/hostgroups_cfg_head.erb&#39;
$ng_tgt_hostgrp_rule_erb = &#39;confdroid_nagios/nagios/hostgroups_cfg_rule.erb&#39;
$ng_target_hostdep = &quot;${ng_conf_d_dir}/nagios_hostdependency.cfg&quot;
$ng_target_hostesc = &quot;${ng_conf_d_dir}/nagios_hostescalation.cfg&quot;
$ng_target_hostext = &quot;${ng_conf_d_dir}/nagios_hostextinfo.cfg&quot;
$ng_target_service = &quot;${ng_conf_d_dir}/nagios_service.cfg&quot;
$ng_target_svcgrp_base = &quot;${ng_conf_d_dir}/nagios_servicegroups_base.cfg&quot;
$ng_tgt_servicegroup_add = &quot;${ng_conf_d_dir}/nagios_servicegroups_add.cfg&quot;
$ng_tgt_svcgrp_head_erb = &#39;confdroid_nagios/nagios/svcgroups_cfg_head.erb&#39;
$ng_tgt_svcgrp_rule_erb = &#39;confdroid_nagios/nagios/svcgroups_cfg_rule.erb&#39;
$ng_target_base_contact = &quot;${ng_conf_d_dir}/nagios_contact_base.cfg&quot;
$ng_target_add_contact = &quot;${ng_conf_d_dir}/nagios_contact_add.cfg&quot;
$ng_contacts_head_erb = &#39;confdroid_nagios/nagios/contacts_cfg_head.erb&#39;
$ng_contacts_rule_erb = &#39;confdroid_nagios/nagios/contacts_cfg_rule.erb&#39;
$ng_tgt_contactgroup_base = &quot;${ng_conf_d_dir}/nagios_contactgroup_base.cfg&quot;
$ng_tgt_contactgroup_add = &quot;${ng_conf_d_dir}/nagios_contactgroup_add.cfg&quot;
$ng_cntctgrps_head_erb = &#39;confdroid_nagios/nagios/contactgroups_cfg_head.erb&#39;
$ng_cntctgrps_rule_erb = &#39;confdroid_nagios/nagios/contactgroups_cfg_rule.erb&#39;
$ng_target_command = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot;
$ng_nagios_service_cmd = &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;
# includes must be last
include confdroid_nagios::main::config
}</pre>