recommit for updates in build 60

This commit is contained in:
2017-07-23 13:38:25 +02:00
parent eeb0c453b5
commit 9920bc9caa
19 changed files with 36 additions and 35 deletions

View File

@@ -1881,12 +1881,14 @@ certificate management</p>
<li>
<span class='name'>ng_certbot_cert_path</span>
<span class='name'>ng_certbot_webroot</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/var/www/html&#39;</tt>)</em>
&mdash;
<div class='inline'>
@@ -1960,19 +1962,6 @@ 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>
@@ -2171,7 +2160,8 @@ required for certbot and used in the web templates.</p>
394
395
396
397</pre>
397
398</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 216</span>
@@ -2350,7 +2340,8 @@ $ng_ssl_vhost_erb = &#39;cd_nagios/httpd/nagios_ssl_vhost.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;
$ng_certbot_check = &quot;${ng_certbot_archive}/${ng_webserver_name}/cert1.pem&quot;
$ng_certbot_live = &quot;${ng_certbot_main_dir}/live&quot;
# includes must be last
@@ -2365,7 +2356,7 @@ $ng_certbot_cert = &quot;${ng_certbot_archive}/${ng_webserver_name}/cert1.p
</div>
<div id="footer">
Generated on Sun Jul 23 13:28:00 2017 by
Generated on Sun Jul 23 13:38:21 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>