recommit for updates in build 34

2017-07-21 16:51:54 +02:00
parent 018f98921e
commit 2c6b5f8656
20 changed files with 44 additions and 24 deletions
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:22 2017 by
+  Generated on Fri Jul 21 16:51:47 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
@@ -179,7 +179,7 @@ class cd_nagios::certbot::config (
      # create cert

      exec { &#39;create_cert&#39;:
-        command   =&gt;  template(&#39;cd_nagios/certbot/get_cert.erb&#39;),
+        command   =&gt;  template($ng_get_cert_erb),
        cwd       =&gt;  &#39;/tmp&#39;,
        path      =&gt;  [&#39;/bin&#39;,&#39;/usr/bin&#39;],
        provider  =&gt;  &#39;shell&#39;,
@@ -196,7 +196,7 @@ class cd_nagios::certbot::config (
        path      =&gt;  [&#39;/bin&#39;,&#39;/usr/bin&#39;,&#39;/opt/&#39;],
        provider  =&gt;  &#39;shell&#39;,
        notify    =&gt;  Service[&#39;httpd&#39;],
-        unless    =&gt;  template(&#39;cd_nagios/certbot/unless_renew_cert.erb&#39;),
+        unless    =&gt;  template($ng_unless_renew_erb),
      }
    }
  }
@@ -208,7 +208,7 @@ class cd_nagios::certbot::config (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:24 2017 by
+  Generated on Fri Jul 21 16:51:50 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:24 2017 by
+  Generated on Fri Jul 21 16:51:50 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:24 2017 by
+  Generated on Fri Jul 21 16:51:51 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -197,7 +197,7 @@ class cd_nagios::main::config (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:24 2017 by
+  Generated on Fri Jul 21 16:51:50 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:23 2017 by
+  Generated on Fri Jul 21 16:51:49 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:24 2017 by
+  Generated on Fri Jul 21 16:51:50 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:24 2017 by
+  Generated on Fri Jul 21 16:51:49 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2124,7 +2124,9 @@ well as for certbot.</p>
 378
 379
 380
-381</pre>
+381
+382
+383</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 213</span>
@@ -2291,7 +2293,9 @@ $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;
-
+$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;

 # includes must be last

@@ -2305,7 +2309,7 @@ $ng_forward_conf_erb  = &#39;cd_nagios/httpd/forward_conf.erb&#39;
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:23 2017 by
+  Generated on Fri Jul 21 16:51:49 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:24 2017 by
+  Generated on Fri Jul 21 16:51:50 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:25 2017 by
+  Generated on Fri Jul 21 16:51:51 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -300,7 +300,7 @@ class cd_nagios::server::files (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:24 2017 by
+  Generated on Fri Jul 21 16:51:50 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:24 2017 by
+  Generated on Fri Jul 21 16:51:50 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>