Merge branch 'jenkins' into 'master'

Jenkins See merge request !21
2017-07-28 19:35:04 +02:00
parent e948552c96 967d659146
commit 34690b7461
16 changed files with 27 additions and 44 deletions
--- a/CHANGELOG.md
+++ b/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/20764ea939762ca">20764ea939762ca</a> Arne Teuke <i>2017-07-28 17:42:06</i>
+<p>
+<h3>updated template</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/0b9b2ab85c5379e">0b9b2ab85c5379e</a> Jenkins Server <i>2017-07-28 17:41:59</i>
+<p>
+<h3>recommit for updates in build 32</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/2e1e26f44536a67">2e1e26f44536a67</a> Jenkins Server <i>2017-07-28 17:39:40</i>
 <p>
 <h3>recommit for updates in build 31</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -166,7 +166,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 19:41:55 2017 by
+  Generated on Fri Jul 28 19:44:05 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 19:41:56 2017 by
+  Generated on Fri Jul 28 19:44:06 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 19:41:55 2017 by
+  Generated on Fri Jul 28 19:44:05 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 19:41:56 2017 by
+  Generated on Fri Jul 28 19:44:06 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 19:41:57 2017 by
+  Generated on Fri Jul 28 19:44:07 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 19:41:57 2017 by
+  Generated on Fri Jul 28 19:44:07 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 19:41:56 2017 by
+  Generated on Fri Jul 28 19:44:06 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 19:41:57 2017 by
+  Generated on Fri Jul 28 19:44:07 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 19:41:57 2017 by
+  Generated on Fri Jul 28 19:44:07 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 19:41:57 2017 by
+  Generated on Fri Jul 28 19:44:07 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 19:41:57 2017 by
+  Generated on Fri Jul 28 19:44:07 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
@@ -1007,7 +1007,7 @@ $ne_nrpe_conf_erb           = &#39;cd_nrpe/nrpe_conf.erb&#39;
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 19:41:56 2017 by
+  Generated on Fri Jul 28 19:44:06 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 19:41:57 2017 by
+  Generated on Fri Jul 28 19:44:07 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 19:41:56 2017 by
+  Generated on Fri Jul 28 19:44:06 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
@@ -32,34 +32,10 @@ allow_bash_command_substitution=<%= @ne_allow_bash_cmd_subst %>
 command_prefix=<%= @ne_command_prefix %>
 <% end -%>

+command_timeout=<%= @ne_command_timeout %>
+connection_timeout=<%= @ne_connection_timeout %>

-# COMMAND TIMEOUT
-# This specifies the maximum number of seconds that the NRPE daemon will
-# allow plugins to finish executing before killing them off.
-
-command_timeout=60
-
-
-# CONNECTION TIMEOUT
-# This specifies the maximum number of seconds that the NRPE daemon will
-# wait for a connection to be established before exiting. This is sometimes
-# seen where a network problem stops the SSL being established even though
-# all network sessions are connected. This causes the nrpe daemons to
-# accumulate, eating system resources. Do not set this too low.
-
-connection_timeout=300
-
-
-# WEAK RANDOM SEED OPTION
-# This directive allows you to use SSL even if your system does not have
-# a /dev/random or /dev/urandom (on purpose or because the necessary patches
-# were not applied). The random number generator will be seeded from a file
-# which is either a file pointed to by the environment valiable $RANDFILE
-# or $HOME/.rnd. If neither exists, the pseudo random number generator will
-# be initialized and a warning will be issued.
-# Values: 0=only seed from /dev/[u]random, 1=also seed from weak randomness
-
-#allow_weak_random_seed=1
+allow_weak_random_seed=<%= @ne_allow_weak_rnd_seed %>


 # SSL/TLS OPTIONS
@@ -189,10 +165,7 @@ command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 150 -c 200



-#command_timeout=<%= @ne_command_timeout %>
-#connection_timeout=<%= @ne_connection_timeout %>

-#allow_weak_random_seed=<%= @ne_allow_weak_rnd_seed %>

 #ssl_version=<%= @ne_ssl_version %>
 #ssl_use_adh=<%= @ne_ssl_use_adh %>