Merge branch 'jenkins' into 'master'

Jenkins See merge request !25
2017-07-28 20:24:15 +02:00
parent 955c000642 2ef92ef372
commit ea9f32786e
16 changed files with 30 additions and 16 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/8dbe3d8b31ce256">8dbe3d8b31ce256</a> Arne Teuke <i>2017-07-28 18:26:27</i>
+<p>
+<h3>updated template</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/c2e28a255730208">c2e28a255730208</a> Jenkins Server <i>2017-07-28 18:26:20</i>
+<p>
+<h3>recommit for updates in build 37</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/259b9d85693d2cf">259b9d85693d2cf</a> Arne Teuke <i>2017-07-28 18:22:05</i>
+<p>
+<h3>updated template</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/7efec6b6a39fc99">7efec6b6a39fc99</a> Arne Teuke <i>2017-07-28 17:57:30</i>
 <p>
 <h3>updated template</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -166,7 +166,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:16 2017 by
+  Generated on Fri Jul 28 20:33:13 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
@@ -252,7 +252,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:17 2017 by
+  Generated on Fri Jul 28 20:33:14 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
@@ -252,7 +252,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:16 2017 by
+  Generated on Fri Jul 28 20:33:13 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_nrpe.html
+++ b/doc/puppet_classes/cd_nrpe.html
@@ -140,7 +140,7 @@ class cd_nrpe {
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:17 2017 by
+  Generated on Fri Jul 28 20:33:14 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_nrpe_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
@@ -165,7 +165,7 @@ class cd_nrpe::firewall::iptables (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:18 2017 by
+  Generated on Fri Jul 28 20:33:15 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_nrpe_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html
@@ -154,7 +154,7 @@ class cd_nrpe::main::config (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:18 2017 by
+  Generated on Fri Jul 28 20:33:15 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_nrpe_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html
@@ -205,7 +205,7 @@ class cd_nrpe::main::dirs (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:18 2017 by
+  Generated on Fri Jul 28 20:33:14 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_nrpe_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
@@ -217,7 +217,7 @@ class cd_nrpe::main::files (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:18 2017 by
+  Generated on Fri Jul 28 20:33:15 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_nrpe_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html
@@ -160,7 +160,7 @@ class cd_nrpe::main::install (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:18 2017 by
+  Generated on Fri Jul 28 20:33:15 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_nrpe_3A_3Amain_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html
@@ -175,7 +175,7 @@ class cd_nrpe::main::service (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:18 2017 by
+  Generated on Fri Jul 28 20:33:15 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_nrpe_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html
@@ -193,7 +193,7 @@ class cd_nrpe::main::user (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:18 2017 by
+  Generated on Fri Jul 28 20:33:15 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_nrpe_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
@@ -1027,7 +1027,7 @@ $ne_nrpe_conf_erb           = &#39;cd_nrpe/nrpe_conf.erb&#39;
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:18 2017 by
+  Generated on Fri Jul 28 20:33:14 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_nrpe_3A_3Acommands_3A_3Adefinitions.html
+++ b/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
@@ -148,7 +148,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 20:26:18 2017 by
+  Generated on Fri Jul 28 20:33:15 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 28 20:26:17 2017 by
+  Generated on Fri Jul 28 20:33:14 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/templates/nrpe_cfg.erb
+++ b/templates/nrpe_cfg.erb
@@ -37,11 +37,10 @@ connection_timeout=<%= @ne_connection_timeout %>

 allow_weak_random_seed=<%= @ne_allow_weak_rnd_seed %>

+<% if $ne_enable_ssl == true -%>
 ssl_version=<%= @ne_ssl_version %>
 ssl_use_adh=<%= @ne_ssl_use_adh %>
 ssl_cipher_list=<%= @ne_ssl_cipher_list %>
-
-<% if $ne_enable_ssl == true -%>
 ssl_cacert_file=<%= @ne_ssl_cacert_file %>
 ssl_cert_file=<%= @ne_ssl_cert_file %>
 ssl_privatekey_file=<%= @ne_ssl_privatekey_file %>