confdroid/confdroid_nagios
3
0
Fork 0
Code Issues Projects Wiki Activity

recommit for updates in build 49

Browse Source
This commit is contained in:
Jenkins Server
2017-07-23 11:29:50 +02:00
parent 2ebbc11375
commit d5cf360678
20 changed files with 70 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
doc/puppet_classes/cd_nagios_3A_3Aparams.html
View File

@@ -1887,8 +1887,6 @@ certificate management</p>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/var/www/html&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1962,6 +1960,19 @@ required for certbot and used in the web templates.</p>
</li>
<li>
<span class='name'>ng_certbot_webroot</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/var/www/html&#39;</tt>)</em>
</li>
</ul>
@@ -2152,7 +2163,13 @@ required for certbot and used in the web templates.</p>
386
387
388
389</pre>
389
390
391
392
393
394
395</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 216</span>
@@ -2271,7 +2288,7 @@ $ng_enable_index = true,
# certbot
$ng_enable_certbot = true,
$ng_certbot_cert_path = &#39;/var/www/html&#39;,
$ng_certbot_webroot = &#39;/var/www/html&#39;,
$ng_webserver_name = &quot;nagios.${::domain}&quot;,
) {
@@ -2326,6 +2343,12 @@ $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;
# certbot
$ng_certbot_main_dir = &#39;/etc/letsencrypt&#39;
$ng_certbot_archive = &quot;${ng_certbot_main_dir}/archive&quot;
$ng_certbot_cert = &quot;${ng_certbot_archive}/${ng_webserver_name}/cert1.pem&quot;
# includes must be last
include cd_nagios::main::config
@@ -2338,7 +2361,7 @@ $ng_index_html_erb = &#39;cd_nagios/httpd/index_html.erb&#39;
</div>
<div id="footer">
Generated on Sat Jul 22 13:38:51 2017 by
Generated on Sun Jul 23 11:29:46 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>