recommit for updates in build 37

CHANGELOG.md

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 <h2> No issue </h2>
 
 
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/abeba0589d446de">abeba0589d446de</a> Jenkins Server <i>2017-07-21 15:18:35</i>
+<p>
+<h3>recommit for updates in build 36</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/01324789d29fa72">01324789d29fa72</a> Arne Teuke <i>2017-07-21 15:18:10</i>
+<p>
+<h3>re-chained certbot</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/183e17f460c21ab">183e17f460c21ab</a> Jenkins Server <i>2017-07-21 15:16:28</i>
 <p>
 <h3>recommit for updates in build 35</h3>

doc/_index.html

@@ -186,7 +186,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 17:18:30 2017 by
+  Generated on Fri Jul 21 17:24:53 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>

doc/file.README.html

@@ -304,7 +304,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Fri Jul 21 17:18:31 2017 by
+  Generated on Fri Jul 21 17:24: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>

doc/index.html

@@ -304,7 +304,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Fri Jul 21 17:18:30 2017 by
+  Generated on Fri Jul 21 17:24: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>

doc/puppet_classes/cd_nagios.html

@@ -139,7 +139,7 @@ class cd_nagios {
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 17:18:31 2017 by
+  Generated on Fri Jul 21 17:24:55 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>

doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html

@@ -192,7 +192,15 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 83
 84
 85
-86</pre>
+86
+87
+88
+89
+90
+91
+92
+93
+94</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/certbot/config.pp', line 23</span>
@@ -202,62 +210,70 @@ class cd_nagios::certbot::config (
 ) inherits cd_nagios::params {
 
   if $::fqdn == $ng_nagios_server {
-    if $ng_enable_certbot == true {
+    if $ng_use_https == true {
+      if $ng_enable_certbot == true {
 
-      require cd_certbot
+        require cd_certbot
 
-      # ensure there is no forward vhost file
+        # ensure there is no forward vhost file
 
-      exec { &#39;remove forward vhost&#39;:
+        exec { &#39;remove_forward_vhost&#39;:
-        command   =&gt;  &quot;rm -Rf ${ng_forward_conf}&quot;,
+          command   =&gt;  &quot;rm -Rf ${ng_forward_conf}&quot;,
-        creates   =&gt;  &#39;/etc/httpd/conf.d/.cert_created&#39;,
+          creates   =&gt;  &#39;/etc/httpd/conf.d/.cert_created&#39;,
+        }
+
+        # create temp vhost file
+
+        exec { &#39;create_temp_vhost&#39;:
+          command   =&gt;  template(&#39;cd_nagios/certbot/create_tempfile.erb&#39;),
+          cwd       =&gt;  &#39;/tmp&#39;,
+          path      =&gt;  [&#39;/bin&#39;,&#39;/usr/bin&#39;],
+          provider  =&gt;  &#39;shell&#39;,
+          creates   =&gt;  &#39;/etc/httpd/conf.d/.created&#39;,
+          notify    =&gt;  Service[&#39;httpd&#39;],
+          require   =&gt;  Exec[&#39;remove_forward_vhost&#39;],
+        }
+
+        # create cert
+
+        exec { &#39;create_cert&#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;,
+          unless    =&gt;  template(&#39;cd_nagios/certbot/unless_get_cert.erb&#39;),
+          notify    =&gt;  Service[&#39;httpd&#39;],
+          creates   =&gt;  &#39;/etc/httpd/conf.d/.cert_created&#39;,
+          require   =&gt;  Exec[&#39;create_temp_vhost&#39;],
+        }
+
+        # remove temp_vhost
+
+        exec { &#39;remove_temp_vhost&#39;:
+          command   =&gt;  &quot;rm -Rf ${ng_certbot_temp_file}&quot;,
+          cwd       =&gt;  &#39;/tmp&#39;,
+          path      =&gt;  [&#39;/bin&#39;,&#39;/usr/bin&#39;],
+          provider  =&gt;  &#39;shell&#39;,
+          notify    =&gt;  Service[&#39;httpd&#39;],
+          require   =&gt;  Exec[&#39;create_cert&#39;],
+          creates   =&gt;  &quot;/etc/letsencrypt/live/${ng_nagios_server}/cert.pem&quot;,
+        }
+
+        # renew certs
+
+        exec {  &#39;renew_cert&#39;:
+          command   =&gt;  &#39;certbot renew&#39;,
+          cwd       =&gt;  &#39;/tmp&#39;,
+          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($ng_unless_renew_erb),
+        }
       }
+    }
 
-      # create temp vhost file
+    else {
-
+      # do nothing as we are not using https and certbot is not required then
-      exec { &#39;create_temp_vhost&#39;:
-        command   =&gt;  template(&#39;cd_nagios/certbot/create_tempfile.erb&#39;),
-        cwd       =&gt;  &#39;/tmp&#39;,
-        path      =&gt;  [&#39;/bin&#39;,&#39;/usr/bin&#39;],
-        provider  =&gt;  &#39;shell&#39;,
-        creates   =&gt;  &#39;/etc/httpd/conf.d/.created&#39;,
-        notify    =&gt;  Service[&#39;httpd&#39;],
-      }
-
-      # create cert
-
-      exec { &#39;create_cert&#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;,
-        unless    =&gt;  template(&#39;cd_nagios/certbot/unless_get_cert.erb&#39;),
-        notify    =&gt;  Service[&#39;httpd&#39;],
-        creates   =&gt;  &#39;/etc/httpd/conf.d/.cert_created&#39;,
-      }
-
-      # remove temp_vhost
-
-      exec { &#39;remove_temp_vhost&#39;:
-        command   =&gt;  &quot;rm -Rf ${ng_certbot_temp_file}&quot;,
-        cwd       =&gt;  &#39;/tmp&#39;,
-        path      =&gt;  [&#39;/bin&#39;,&#39;/usr/bin&#39;],
-        provider  =&gt;  &#39;shell&#39;,
-        notify    =&gt;  Service[&#39;httpd&#39;],
-        require   =&gt;  Exec[&#39;create_cert&#39;],
-        creates   =&gt;  &quot;/etc/letsencrypt/live/${ng_nagios_server}/cert.pem&quot;,
-      }
-
-      # renew certs
-
-      exec {  &#39;renew_cert&#39;:
-        command   =&gt;  &#39;certbot renew&#39;,
-        cwd       =&gt;  &#39;/tmp&#39;,
-        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($ng_unless_renew_erb),
-      }
     }
   }
 }</pre>
@@ -268,7 +284,7 @@ class cd_nagios::certbot::config (
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 17:18:33 2017 by
+  Generated on Fri Jul 21 17:24:57 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>

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 17:18:33 2017 by
+  Generated on Fri Jul 21 17:24:56 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>

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 17:18:33 2017 by
+  Generated on Fri Jul 21 17:24:57 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>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html

@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 17:18:33 2017 by
+  Generated on Fri Jul 21 17:24:56 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>

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 17:18:32 2017 by
+  Generated on Fri Jul 21 17:24:56 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>

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 17:18:33 2017 by
+  Generated on Fri Jul 21 17:24:56 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>

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 17:18:32 2017 by
+  Generated on Fri Jul 21 17:24:56 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>

doc/puppet_classes/cd_nagios_3A_3Aparams.html

@@ -2313,7 +2313,7 @@ $ng_certbot_temp_file = '/etc/httpd/conf.d/certbot_temp.conf'
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 17:18:32 2017 by
+  Generated on Fri Jul 21 17:24:56 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>

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 17:18:33 2017 by
+  Generated on Fri Jul 21 17:24:57 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>

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 17:18:33 2017 by
+  Generated on Fri Jul 21 17:24:57 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>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html

@@ -452,7 +452,7 @@ class cd_nagios::server::files (
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 17:18:33 2017 by
+  Generated on Fri Jul 21 17:24:56 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>

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 17:18:33 2017 by
+  Generated on Fri Jul 21 17:24:57 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>

doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html

@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 17:18:33 2017 by
+  Generated on Fri Jul 21 17:24:57 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>

doc/top-level-namespace.html

@@ -90,7 +90,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 17:18:31 2017 by
+  Generated on Fri Jul 21 17:24:55 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>