recommit for updates in build 25
This commit is contained in:
@@ -1854,6 +1854,19 @@ Requires format 'ipaddress ip address range'</p>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
|
||||
<span class='name'>ng_disable_welcome</span>
|
||||
|
||||
|
||||
<span class='type'>(<tt>Any</tt>)</span>
|
||||
|
||||
|
||||
<em class="default">(defaults to: <tt>true</tt>)</em>
|
||||
|
||||
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
|
||||
|
||||
@@ -2028,7 +2041,9 @@ Requires format 'ipaddress ip address range'</p>
|
||||
357
|
||||
358
|
||||
359
|
||||
360</pre>
|
||||
360
|
||||
361
|
||||
362</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 203</span>
|
||||
@@ -2142,7 +2157,7 @@ $ng_use_selinux_tools = true,
|
||||
# httpd
|
||||
$ng_required_hosts = '',
|
||||
$ng_required_ips = '127.0.0.0/8',
|
||||
|
||||
$ng_disable_welcome = true,
|
||||
) {
|
||||
|
||||
# installation section
|
||||
@@ -2158,33 +2173,35 @@ $ng_required_ips = '127.0.0.0/8',
|
||||
}
|
||||
|
||||
# service
|
||||
$ng_service = 'nagios'
|
||||
$ae_service = 'httpd'
|
||||
$ng_service = 'nagios'
|
||||
$ae_service = 'httpd'
|
||||
|
||||
# directories
|
||||
$ng_main_dir = '/etc/nagios'
|
||||
$ng_conf_d_dir = "${ng_main_dir}/conf.d"
|
||||
$ng_objects_dir = "${ng_main_dir}/objects"
|
||||
$ng_private_dir = "${ng_main_dir}/private"
|
||||
$ng_usr_incl = '/usr/include/nagios'
|
||||
$ng_lib_dir = '/usr/lib64/nagios'
|
||||
$ng_log_dir = '/var/log/nagios'
|
||||
$ng_log_archives = "${ng_log_dir}/archives"
|
||||
$ng_spool_dir = '/var/spool/nagios'
|
||||
$ng_usr_share = '/usr/share/nagios'
|
||||
$ng_share_html = "${ng_usr_share}/html"
|
||||
$ng_main_dir = '/etc/nagios'
|
||||
$ng_conf_d_dir = "${ng_main_dir}/conf.d"
|
||||
$ng_objects_dir = "${ng_main_dir}/objects"
|
||||
$ng_private_dir = "${ng_main_dir}/private"
|
||||
$ng_usr_incl = '/usr/include/nagios'
|
||||
$ng_lib_dir = '/usr/lib64/nagios'
|
||||
$ng_log_dir = '/var/log/nagios'
|
||||
$ng_log_archives = "${ng_log_dir}/archives"
|
||||
$ng_spool_dir = '/var/spool/nagios'
|
||||
$ng_usr_share = '/usr/share/nagios'
|
||||
$ng_share_html = "${ng_usr_share}/html"
|
||||
|
||||
# files
|
||||
$ng_main_config = "${ng_main_dir}/nagios.cfg"
|
||||
$ng_cgi_cfg_file = "${ng_main_dir}/cgi.cfg"
|
||||
$ng_cgi_cfg_erb = 'cd_nagios/nagios/cgi_cfg.erb'
|
||||
$ng_htpasswd_file = "${ng_main_dir}/passwd"
|
||||
$ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb'
|
||||
$ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb'
|
||||
$ng_taccgi_erb = 'cd_nagios/selinux/taccgi.erb'
|
||||
$ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb'
|
||||
$ng_nagios_conf = '/etc/httpd/conf.d/nagios.conf'
|
||||
$ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb'
|
||||
$ng_main_config = "${ng_main_dir}/nagios.cfg"
|
||||
$ng_cgi_cfg_file = "${ng_main_dir}/cgi.cfg"
|
||||
$ng_cgi_cfg_erb = 'cd_nagios/nagios/cgi_cfg.erb'
|
||||
$ng_htpasswd_file = "${ng_main_dir}/passwd"
|
||||
$ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb'
|
||||
$ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb'
|
||||
$ng_taccgi_erb = 'cd_nagios/selinux/taccgi.erb'
|
||||
$ng_statcgi_erb = 'cd_nagios/selinux/statuscgi.erb'
|
||||
$ng_nagios_conf = '/etc/httpd/conf.d/nagios.conf'
|
||||
$ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb'
|
||||
$ng_welcome_conf ='/etc/httpd/conf.d/welcome.conf'
|
||||
$ng_welcome_conf_erb = 'cd_nagios/httpd/welcome_conf.erb'
|
||||
|
||||
# includes must be last
|
||||
|
||||
@@ -2198,7 +2215,7 @@ $ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb'
|
||||
</div>
|
||||
|
||||
<div id="footer">
|
||||
Generated on Fri Jul 21 14:51:30 2017 by
|
||||
Generated on Fri Jul 21 15:06:11 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>
|
||||
|
||||
Reference in New Issue
Block a user