Merge branch 'jenkins' into 'master'

Jenkins See merge request !22
2017-07-28 19:43:29 +02:00
parent 34690b7461 7e385567bf
commit 0186975d54
16 changed files with 32 additions and 69 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/967d659146b79e6">967d659146b79e6</a> Jenkins Server <i>2017-07-28 17:44:09</i>
+<p>
+<h3>recommit for updates in build 33</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/60d516c21e0387b">60d516c21e0387b</a> Arne Teuke <i>2017-07-28 17:44:04</i>
+<p>
+<h3>updated template</h3>
+
+</p>
 <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>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -166,7 +166,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 19:44:05 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- 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:44:06 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- 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:44:05 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- 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:44:06 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- 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:44:07 2017 by
+  Generated on Fri Jul 28 19:48:58 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:44:07 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- 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:44:06 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- 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:44:07 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- 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:44:07 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- 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:44:07 2017 by
+  Generated on Fri Jul 28 19:48:58 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:44:07 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- 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:44:06 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- 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:44:07 2017 by
+  Generated on Fri Jul 28 19:48:58 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:44:06 2017 by
+  Generated on Fri Jul 28 19:48: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>
--- a/templates/nrpe_cfg.erb
+++ b/templates/nrpe_cfg.erb
@@ -37,65 +37,18 @@ 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 %>
+ssl_cipher_list=<%= @ne_ssl_cipher_list %>

-# SSL/TLS OPTIONS
-# These directives allow you to specify how to use SSL/TLS.
+#ssl_cacert_file=<%= @ne_ssl_cacert_file %>
+#ssl_cert_file=<%= @ne_ssl_cert_file %>
+#ssl_privatekey_file=<%= @ne_ssl_privatekey_file %>

-# SSL VERSION
-# This can be any of: SSLv2 (only use SSLv2), SSLv2+ (use any version),
-# SSLv3 (only use SSLv3), SSLv3+ (use SSLv3 or above), TLSv1 (only use
-# TLSv1), TLSv1+ (use TLSv1 or above), TLSv1.1 (only use TLSv1.1),
-# TLSv1.1+ (use TLSv1.1 or above), TLSv1.2 (only use TLSv1.2),
-# TLSv1.2+ (use TLSv1.2 or above)
-# If an "or above" version is used, the best will be negotiated. So if both
-# ends are able to do TLSv1.2 and use specify SSLv2, you will get TLSv1.2.
-# If you are using openssl 1.1.0 or above, the SSLv2 options are not available.
+#ssl_client_certs=<%= @ne_ssl_client_certs %>
+#ssl_logging=<%= @ne_ssl_logging %>

-#ssl_version=SSLv2+

-# SSL USE ADH
-# This is for backward compatibility and is DEPRECATED. Set to 1 to enable
-# ADH or 2 to require ADH. 1 is currently the default but will be changed
-# in a later version.
-
-#ssl_use_adh=1
-
-# SSL CIPHER LIST
-# This lists which ciphers can be used. For backward compatibility, this
-# defaults to 'ssl_cipher_list=ALL:!MD5:@STRENGTH' in this version but
-# will be changed to something like the example below in a later version of NRPE.
-
-#ssl_cipher_list=ALL:!MD5:@STRENGTH
-#ssl_cipher_list=ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH
-
-# SSL Certificate and Private Key Files
-
-#ssl_cacert_file=/etc/ssl/servercerts/ca-cert.pem
-#ssl_cert_file=/etc/ssl/servercerts/nagios-cert.pem
-#ssl_privatekey_file=/etc/ssl/servercerts/nagios-key.pem
-
-# SSL USE CLIENT CERTS
-# This options determines client certificate usage.
-# Values: 0 = Don't ask for or require client certificates (default)
-# 1 = Ask for client certificates
-# 2 = Require client certificates
-
-#ssl_client_certs=0
-
-# SSL LOGGING
-# This option determines which SSL messages are send to syslog. OR values
-# together to specify multiple options.
-
-# Values: 0x00 (0) = No additional logging (default)
-# 0x01 (1) = Log startup SSL/TLS parameters
-# 0x02 (2) = Log remote IP address
-# 0x04 (4) = Log SSL/TLS version of connections
-# 0x08 (8) = Log which cipher is being used for the connection
-# 0x10 (16) = Log if client has a certificate
-# 0x20 (32) = Log details of client's certificate if it has one
-# -1 or 0xff or 0x2f = All of the above
-
-#ssl_logging=0x00


 # NASTY METACHARACTERS