recommit for updates in build 123

This commit is contained in:
2017-07-27 16:44:56 +02:00
parent 7e81016ca5
commit f8d19b46fd
39 changed files with 215 additions and 183 deletions

View File

@@ -4875,19 +4875,6 @@ up</p>
</li>
<li>
<span class='name'>ng_nagios_service_cmd</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;</tt>)</em>
</li>
</ul>
@@ -5258,8 +5245,7 @@ up</p>
996
997
998
999
1000</pre>
999</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 646</span>
@@ -5513,7 +5499,6 @@ $ng_check_workers = &#39;&#39;,
$ng_host_down_svc_checks = &#39;0&#39;,
$ng_enable_load_ctl_options = false,
$ng_loadctl_options = &#39;jobs_max=100;backoff_limit=10;rampup_change=5&#39;,
$ng_nagios_service_cmd = &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;,
) {
@@ -5534,85 +5519,85 @@ $ng_nagios_service_cmd = &#39;check_nagios!/var/log/nagios/status.dat!5!/us
}
# service
$ng_service = &#39;nagios&#39;
$ae_service = &#39;httpd&#39;
$ng_service = &#39;nagios&#39;
$ae_service = &#39;httpd&#39;
# directories
$ng_main_dir = &#39;/etc/nagios&#39;
$ng_conf_d_dir = &quot;${ng_main_dir}/conf.d&quot;
$ng_objects_dir = &quot;${ng_main_dir}/objects&quot;
$ng_private_dir = &quot;${ng_main_dir}/private&quot;
$ng_usr_incl = &#39;/usr/include/nagios&#39;
$ng_lib_dir = &#39;/usr/lib64/nagios&#39;
$ng_log_dir = &#39;/var/log/nagios&#39;
$ng_log_archives = &quot;${ng_log_dir}/archives&quot;
$ng_spool_dir = &#39;/var/spool/nagios&#39;
$ng_usr_share = &#39;/usr/share/nagios&#39;
$ng_share_html = &quot;${ng_usr_share}/html&quot;
$ng_main_dir = &#39;/etc/nagios&#39;
$ng_conf_d_dir = &quot;${ng_main_dir}/conf.d&quot;
$ng_objects_dir = &quot;${ng_main_dir}/objects&quot;
$ng_private_dir = &quot;${ng_main_dir}/private&quot;
$ng_usr_incl = &#39;/usr/include/nagios&#39;
$ng_lib_dir = &#39;/usr/lib64/nagios&#39;
$ng_log_dir = &#39;/var/log/nagios&#39;
$ng_log_archives = &quot;${ng_log_dir}/archives&quot;
$ng_spool_dir = &#39;/var/spool/nagios&#39;
$ng_usr_share = &#39;/usr/share/nagios&#39;
$ng_share_html = &quot;${ng_usr_share}/html&quot;
# files
$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;cd_nagios/nagios/cgi_cfg.erb&#39;
$ng_htpasswd_file = &quot;${ng_main_dir}/passwd&quot;
$ng_htpasswd_head = &#39;cd_nagios/nagios/htpasswd_head.erb&#39;
$ng_htpasswd_rule = &#39;cd_nagios/nagios/htpasswd_rule.erb&#39;
$ng_taccgi_erb = &#39;cd_nagios/selinux/taccgi.erb&#39;
$ng_statcgi_erb = &#39;cd_nagios/selinux/statuscgi.erb&#39;
$ng_nagios_conf = &#39;/etc/httpd/conf.d/nagios.conf&#39;
$ng_nagios_conf_erb = &#39;cd_nagios/httpd/nagios_conf.erb&#39;
$ng_welcome_conf = &#39;/etc/httpd/conf.d/welcome.conf&#39;
$ng_welcome_conf_erb = &#39;cd_nagios/httpd/welcome_conf.erb&#39;
$ng_forward_conf = &#39;/etc/httpd/conf.d/nagios_forward.conf&#39;
$ng_forward_conf_erb = &#39;cd_nagios/httpd/forward_conf.erb&#39;
$ng_get_cert_erb = &#39;cd_nagios/certbot/get_cert.erb&#39;
$ng_unless_get_cert = &#39;cd_nagios/certbot/unless_get_cert.erb&#39;
$ng_unless_renew_erb = &#39;cd_nagios/certbot/unless_renew_cert.erb&#39;
$ng_index_html_file = &#39;/var/www/html/index.html&#39;
$ng_index_html_erb = &#39;cd_nagios/httpd/index_html.erb&#39;
$ng_ssl_vhost_file = &#39;/etc/httpd/conf.d/nagios_ssl.conf&#39;
$ng_ssl_vhost_erb = &#39;cd_nagios/httpd/nagios_ssl_vhost.erb&#39;
$ng_nagios_cfg_file = &quot;${ng_main_dir}/nagios.cfg&quot;
$ng_nagios_cfg_erb = &#39;cd_nagios/nagios/nagios_cfg.erb&#39;
$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;cd_nagios/nagios/cgi_cfg.erb&#39;
$ng_htpasswd_file = &quot;${ng_main_dir}/passwd&quot;
$ng_htpasswd_head = &#39;cd_nagios/nagios/htpasswd_head.erb&#39;
$ng_htpasswd_rule = &#39;cd_nagios/nagios/htpasswd_rule.erb&#39;
$ng_taccgi_erb = &#39;cd_nagios/selinux/taccgi.erb&#39;
$ng_statcgi_erb = &#39;cd_nagios/selinux/statuscgi.erb&#39;
$ng_nagios_conf = &#39;/etc/httpd/conf.d/nagios.conf&#39;
$ng_nagios_conf_erb = &#39;cd_nagios/httpd/nagios_conf.erb&#39;
$ng_welcome_conf = &#39;/etc/httpd/conf.d/welcome.conf&#39;
$ng_welcome_conf_erb = &#39;cd_nagios/httpd/welcome_conf.erb&#39;
$ng_forward_conf = &#39;/etc/httpd/conf.d/nagios_forward.conf&#39;
$ng_forward_conf_erb = &#39;cd_nagios/httpd/forward_conf.erb&#39;
$ng_get_cert_erb = &#39;cd_nagios/certbot/get_cert.erb&#39;
$ng_unless_get_cert = &#39;cd_nagios/certbot/unless_get_cert.erb&#39;
$ng_unless_renew_erb = &#39;cd_nagios/certbot/unless_renew_cert.erb&#39;
$ng_index_html_file = &#39;/var/www/html/index.html&#39;
$ng_index_html_erb = &#39;cd_nagios/httpd/index_html.erb&#39;
$ng_ssl_vhost_file = &#39;/etc/httpd/conf.d/nagios_ssl.conf&#39;
$ng_ssl_vhost_erb = &#39;cd_nagios/httpd/nagios_ssl_vhost.erb&#39;
$ng_nagios_cfg_file = &quot;${ng_main_dir}/nagios.cfg&quot;
$ng_nagios_cfg_erb = &#39;cd_nagios/nagios/nagios_cfg.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;
$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;cd_nagios/nagios/templates_cfg_head.erb&#39;
$ng_templates_rule_erb = &#39;cd_nagios/nagios/templates_cfg_rule.erb&#39;
$ng_tgt_timeperiods_base = &quot;${ng_conf_d_dir}/nagios_timeperiods.cfg&quot;
$ng_tgt_timeperiods_add = &quot;${ng_conf_d_dir}/nagios_timeperiods_add.cfg&quot;
$ng_tgt_timep_head_erb = &#39;cd_nagios/nagios/timeperiods_cfg_head.erb&#39;
$ng_tgt_timep_rule_erb = &#39;cd_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;cd_nagios/nagios/hostgroups_cfg_head.erb&#39;
$ng_tgt_hostgrp_rule_erb = &#39;cd_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;cd_nagios/nagios/svcgroups_cfg_head.erb&#39;
$ng_tgt_hostgrp_rule_erb = &#39;cd_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;cd_nagios/nagios/contacts_cfg_head.erb&#39;
$ng_contacts_rule_erb = &#39;cd_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;cd_nagios/nagios/contactgroups_cfg_head.erb&#39;
$ng_cntctgrps_rule_erb = &#39;cd_nagios/nagios/contactgroups_cfg_rule.erb&#39;
$ng_target_command = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot;
$ng_target_templates = &quot;${ng_conf_d_dir}/nagios_templates.cfg&quot;
$ng_templates_head_erb = &#39;cd_nagios/nagios/templates_cfg_head.erb&#39;
$ng_templates_rule_erb = &#39;cd_nagios/nagios/templates_cfg_rule.erb&#39;
$ng_tgt_timeperiods_base = &quot;${ng_conf_d_dir}/nagios_timeperiods.cfg&quot;
$ng_tgt_timeperiods_add = &quot;${ng_conf_d_dir}/nagios_timeperiods_add.cfg&quot;
$ng_tgt_timep_head_erb = &#39;cd_nagios/nagios/timeperiods_cfg_head.erb&#39;
$ng_tgt_timep_rule_erb = &#39;cd_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;cd_nagios/nagios/hostgroups_cfg_head.erb&#39;
$ng_tgt_hostgrp_rule_erb = &#39;cd_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;cd_nagios/nagios/svcgroups_cfg_head.erb&#39;
$ng_tgt_svcgrp_rule_erb = &#39;cd_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;cd_nagios/nagios/contacts_cfg_head.erb&#39;
$ng_contacts_rule_erb = &#39;cd_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;cd_nagios/nagios/contactgroups_cfg_head.erb&#39;
$ng_cntctgrps_rule_erb = &#39;cd_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
@@ -5626,7 +5611,7 @@ $ng_target_command = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot
</div>
<div id="footer">
Generated on Thu Jul 27 16:28:58 2017 by
Generated on Thu Jul 27 16:44:47 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>