Merge branch 'jenkins' into 'master'

Jenkins See merge request !16
2017-07-21 16:42:52 +02:00
parent 78f105660d 2c6b5f8656
commit 8b49ce3422
23 changed files with 56 additions and 27 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/353e7e99cf92594">353e7e99cf92594</a> Jenkins Server <i>2017-07-21 14:42:28</i>
+<p>
+<h3>recommit for updates in build 33</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/e6b974ad08de5d5">e6b974ad08de5d5</a> Arne Teuke <i>2017-07-21 14:40:41</i>
+<p>
+<h3>fixed typo</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/c2f38a68165529b">c2f38a68165529b</a> Arne Teuke <i>2017-07-21 14:38:51</i>
+<p>
+<h3>added and linked certbot</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/4d4f5636b803d9e">4d4f5636b803d9e</a> Jenkins Server <i>2017-07-21 14:34:25</i>
 <p>
 <h3>recommit for updates in build 30</h3>
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -55,7 +55,8 @@
 |-- templates
 |   |-- certbot
 |   |   |-- get_cert.erb
-|   |   `-- unless_get_cert.erb
+|   |   |-- unless_get_cert.erb
+|   |   `-- unless_renew_cert.erb
 |   |-- httpd
 |   |   |-- forward_conf.erb
 |   |   |-- nagios_conf.erb
@@ -76,4 +77,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md

-18 directories, 58 files
+18 directories, 59 files
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:20 2017 by
+  Generated on Fri Jul 21 16:51: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>
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -304,7 +304,7 @@ environments.</p>
 </div></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/index.html
+++ b/doc/index.html
@@ -304,7 +304,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 21 16:42:21 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.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>
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/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 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/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </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/manifests/certbot/config.pp
+++ b/manifests/certbot/config.pp
@@ -32,7 +32,7 @@ class cd_nagios::certbot::config (
      # create cert

      exec { 'create_cert':
-        command   =>  template('cd_nagios/certbot/get_cert.erb'),
+        command   =>  template($ng_get_cert_erb),
        cwd       =>  '/tmp',
        path      =>  ['/bin','/usr/bin'],
        provider  =>  'shell',
@@ -49,7 +49,7 @@ class cd_nagios::certbot::config (
        path      =>  ['/bin','/usr/bin','/opt/'],
        provider  =>  'shell',
        notify    =>  Service['httpd'],
-        unless    =>  template('cd_nagios/certbot/unless_renew_cert.erb'),
+        unless    =>  template($ng_unless_renew_erb),
      }
    }
  }
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -372,7 +372,9 @@ $ng_welcome_conf      = '/etc/httpd/conf.d/welcome.conf'
 $ng_welcome_conf_erb  = 'cd_nagios/httpd/welcome_conf.erb'
 $ng_forward_conf      = '/etc/httpd/conf.d/nagios_forward.conf'
 $ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
-
+$ng_get_cert_erb      = 'cd_nagios/certbot/get_cert.erb'
+$ng_unless_get_cert   = 'cd_nagios/certbot/unless_get_cert.erb'
+$ng_unless_renew_erb  =  'cd_nagios/certbot/unless_renew_cert.erb'

 # includes must be last

--- a/templates/certbot/unless_renew_cert.erb
+++ b/templates/certbot/unless_renew_cert.erb
@@ -0,0 +1,7 @@
+#!/bin/bash
+<% if @ng_enable_certbot == true %>
+case `find /etc/letsencrypt/renewal -type f -name "<%= @ng_nagios_server %>.conf" -mtime +80` in
+  '') echo 'No filename found' exit 0 ;;
+  *) echo 'Found filename' exit 1 ;;
+esac
+<% end %>