recommit for updates in build 26

This commit is contained in:
2017-07-21 15:43:26 +02:00
parent df148ea403
commit 1fc9ffeacd
19 changed files with 94 additions and 29 deletions

View File

@@ -1859,12 +1859,20 @@ Requires format &#39;ipaddress ip address range&#39;</p>
<span class='name'>ng_disable_welcome</span>
<span class='type'>(<tt>Any</tt>)</span>
<span class='type'>(<tt>boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether the regular welcome screen should
be disabled. this is required for
the nagios http check on the nagios server
to be successful.</p>
</div>
</li>
</ul>
@@ -1884,9 +1892,6 @@ Requires format &#39;ipaddress ip address range&#39;</p>
<pre class="lines">
203
204
205
206
207
208
@@ -2043,10 +2048,17 @@ Requires format &#39;ipaddress ip address range&#39;</p>
359
360
361
362</pre>
362
363
364
365
366
367
368
369</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 203</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 206</span>
class cd_nagios::params (
@@ -2158,6 +2170,7 @@ $ng_use_selinux_tools = true,
$ng_required_hosts = &#39;&#39;,
$ng_required_ips = &#39;127.0.0.0/8&#39;,
$ng_disable_welcome = true,
) {
# installation section
@@ -2200,8 +2213,11 @@ $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 = &#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;
# includes must be last
@@ -2215,7 +2231,7 @@ $ng_welcome_conf_erb = &#39;cd_nagios/httpd/welcome_conf.erb&#39;
</div>
<div id="footer">
Generated on Fri Jul 21 15:06:11 2017 by
Generated on Fri Jul 21 15:43:22 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>