recommit for updates in build 40

This commit is contained in:
2017-07-21 18:11:57 +02:00
parent bd97383ea2
commit 7fff54ce74
21 changed files with 126 additions and 304 deletions

View File

@@ -1860,27 +1860,6 @@ choose &#39;0.0.0.0/0&#39;</p>
</li>
<li>
<span class='name'>ng_disable_welcome</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>
<li>
<span class='name'>ng_enable_certbot</span>
@@ -1914,7 +1893,7 @@ certificate management</p>
&mdash;
<div class='inline'>
<p>the path for certbot to place
challenges for teh certification process.</p>
challenges for the certification process.</p>
</div>
</li>
@@ -1935,6 +1914,26 @@ challenges for teh certification process.</p>
<p>email address to receive administrative mail.
used for nagios itself as
well as for certbot.</p>
</div>
</li>
<li>
<span class='name'>ng_enable_index</span>
<span class='type'>(<tt>boolean</tt>)</span>
<em class="default">(defaults to: <tt>true</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to create an index file to allow
httpd checks with nagios on the
nagios server.</p>
</div>
</li>
@@ -1956,6 +1955,7 @@ well as for certbot.</p>
<pre class="lines">
212
213
214
215
@@ -2127,11 +2127,10 @@ well as for certbot.</p>
381
382
383
384
385</pre>
384</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 213</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 212</span>
class cd_nagios::params (
@@ -2243,7 +2242,7 @@ $ng_use_selinux_tools = true,
# httpd
$ng_required_hosts = &#39;&#39;,
$ng_required_ips = &#39;127.0.0.0/8&#39;,
$ng_disable_welcome = true,
$ng_enable_index = true,
# certbot
$ng_enable_certbot = true,
@@ -2298,8 +2297,8 @@ $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_create_tempvhost = &#39;cd_nagios/certbot/create_tempfile.erb&#39;
$ng_certbot_temp_file = &#39;/etc/httpd/conf.d/certbot_temp.conf&#39;
$ng_index_html_file = &#39;/var/www/html/index.html&#39;
$ng_index_html_erb = &#39;cd_nagios/httpd/index_html.erb&#39;
# includes must be last
@@ -2313,7 +2312,7 @@ $ng_certbot_temp_file = &#39;/etc/httpd/conf.d/certbot_temp.conf&#39;
</div>
<div id="footer">
Generated on Fri Jul 21 17:46:54 2017 by
Generated on Fri Jul 21 18:11:54 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>