Merge branch 'jenkins' into 'master'

Jenkins See merge request !37
2017-07-30 19:56:41 +02:00
parent c7082b69fe edc943caf4
commit a258533817
19 changed files with 61 additions and 21 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/0e95b79c6ee5bf6">0e95b79c6ee5bf6</a> Arne Teuke <i>2017-07-30 17:02:06</i>
+<p>
+<h3>re-enabled sudo setting</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a07e88ee0c6f279">a07e88ee0c6f279</a> Jenkins Server <i>2017-07-30 17:02:01</i>
+<p>
+<h3>recommit for updates in build 57</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/27d1b70d6198a0b">27d1b70d6198a0b</a> Arne Teuke <i>2017-07-30 16:58:43</i>
 <p>
 <h3>added selinux boolean</h3>
--- a/README.md
+++ b/README.md
@@ -111,6 +111,12 @@ All files and directories are configured with correct selinux context. If selinu
 ### Known Problems
 * SSL/TLS support: Version 3 of NRPE supposedly has support for SSL/ TLs. However, at the time of writing this module, this seems to be buggy, as I was unable to start the NRPE service as soon as the `ssl_cert_file` line was uncommented in teh configuration file, despite having valid certs in the right position on the node. This happened when installing manually, not through this Puppet module. For that reason I included the `$ne_enable_ssl` boolean parameter, which is set to `false` by default, hence disabling SSL/TLS options until this has been fixed upstream, or a valid workaround has been found.  Setting this option  to `true` will include all SSL / TLS settings.

+### Troubleshooting
+* `CHECH_NRPE: Unable to read output`: Nagios sudo access also needs Selinux to allow this. Default settings in this module take care for both through `$ne_allow_sudo` and `$ne_include_selinux`.
+* `CHECK_NRPE: Receive header underflow - only 0 bytes received (4 expected): This is down to the new illegal meta characters feature via `nasty_metachars`.
+
+
+
 ### Support
 * OS: CentOS 6, 7
 * Puppet 3.x
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -176,7 +176,7 @@
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 19:01:55 2017 by
+  Generated on Sun Jul 30 20:06:22 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
@@ -277,6 +277,18 @@ has been fixed upstream, or a valid workaround has been found. Setting this
 option to <code>true</code> will include all SSL / TLS settings.</p>
 </li></ul>

+<h3 id="label-Troubleshooting">Troubleshooting</h3>
+<ul><li>
+<p><code>CHECH_NRPE: Unable to read output</code>: Nagios sudo access also
+needs Selinux to allow this. Default settings in this module take care for
+both through <code>$ne_allow_sudo</code> and
+<code>$ne_include_selinux</code>.</p>
+</li><li>
+<p><code>CHECK_NRPE: Receive header underflow - only 0 bytes received (4
+expected): This is down to the new illegal meta characters feature
+via</code>nasty_metachars`.</p>
+</li></ul>
+
 <h3 id="label-Support">Support</h3>
 <ul><li>
 <p>OS: CentOS 6, 7</p>
@@ -330,7 +342,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Sun Jul 30 19:01:57 2017 by
+  Generated on Sun Jul 30 20:06:24 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
@@ -277,6 +277,18 @@ has been fixed upstream, or a valid workaround has been found. Setting this
 option to <code>true</code> will include all SSL / TLS settings.</p>
 </li></ul>

+<h3 id="label-Troubleshooting">Troubleshooting</h3>
+<ul><li>
+<p><code>CHECH_NRPE: Unable to read output</code>: Nagios sudo access also
+needs Selinux to allow this. Default settings in this module take care for
+both through <code>$ne_allow_sudo</code> and
+<code>$ne_include_selinux</code>.</p>
+</li><li>
+<p><code>CHECK_NRPE: Receive header underflow - only 0 bytes received (4
+expected): This is down to the new illegal meta characters feature
+via</code>nasty_metachars`.</p>
+</li></ul>
+
 <h3 id="label-Support">Support</h3>
 <ul><li>
 <p>OS: CentOS 6, 7</p>
@@ -330,7 +342,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Sun Jul 30 19:01:56 2017 by
+  Generated on Sun Jul 30 20:06:23 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 Sun Jul 30 19:01:57 2017 by
+  Generated on Sun Jul 30 20:06:24 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_3Acommands_3A_3Adefinition_rules.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Acommands_3A_3Adefinition_rules.html
@@ -267,7 +267,7 @@ class cd_nrpe::commands::definition_rules (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 19:01:58 2017 by
+  Generated on Sun Jul 30 20:06:25 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 Sun Jul 30 19:01:58 2017 by
+  Generated on Sun Jul 30 20:06:25 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 Sun Jul 30 19:01:58 2017 by
+  Generated on Sun Jul 30 20:06:25 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 Sun Jul 30 19:01:58 2017 by
+  Generated on Sun Jul 30 20:06:25 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
@@ -247,7 +247,7 @@ class cd_nrpe::main::files (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 19:01:58 2017 by
+  Generated on Sun Jul 30 20:06:25 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 Sun Jul 30 19:01:58 2017 by
+  Generated on Sun Jul 30 20:06:25 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
@@ -191,7 +191,7 @@ class cd_nrpe::main::service (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 19:01:58 2017 by
+  Generated on Sun Jul 30 20:06:25 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 Sun Jul 30 19:01:58 2017 by
+  Generated on Sun Jul 30 20:06:25 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
@@ -601,10 +601,10 @@ one
        <span class='name'>ne_nasty_metachars</span>
      
      
-        <span class='type'>(<tt>string</tt>)</span>
+        <span class='type'>(<tt>array</tt>)</span>
      
      
-        <em class="default">(defaults to: <tt>&#39;&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>[&quot;|`&amp;&gt;&lt;[]{};\n\&#39;&quot;]</tt>)</em>
      
      
        &mdash;
@@ -1015,7 +1015,7 @@ $ne_ssl_cert_file           = &quot;/etc/pki/tls/certs/${::fqdn}.crt.pem&quot;,
 $ne_ssl_privatekey_file     = &quot;/etc/pki/tls/private/${::fqdn}.key.pem&quot;,
 $ne_ssl_client_certs        = &#39;2&#39;,
 $ne_ssl_logging             = &#39;0x00&#39;,
-$ne_nasty_metachars         = &#39;&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;,
+$ne_nasty_metachars         = [&quot;|`&amp;&gt;&lt;[]{};\n\&#39;&quot;],
 $ne_include_file            = &#39;&#39;,

 # nrpe.conf
@@ -1067,7 +1067,7 @@ $ne_sudo_rule_erb           = &#39;cd_nrpe/sudo_rule.erb&#39;
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 19:01:58 2017 by
+  Generated on Sun Jul 30 20:06:25 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_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Aselinux_3A_3Aconfig.html
@@ -170,7 +170,7 @@ class cd_nrpe::selinux::config (
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 19:01:58 2017 by
+  Generated on Sun Jul 30 20:06:25 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
@@ -259,7 +259,7 @@ $ne_manage_cmds   = $::cd_nrpe::params::ne_manage_cmds
 </div>

      <div id="footer">
-  Generated on Sun Jul 30 19:01:59 2017 by
+  Generated on Sun Jul 30 20:06:26 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 Sun Jul 30 19:01:57 2017 by
+  Generated on Sun Jul 30 20:06:24 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/params.pp
+++ b/manifests/params.pp
@@ -78,7 +78,7 @@
 #   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
-# @param  [string] ne_nasty_metachars  list of characters that cannot
+# @param  [array] ne_nasty_metachars  list of characters that cannot
 # be passed to the NRPE daemon.
 # @param  [string] ne_include_file include definitions from an external
 #   config file.
@@ -137,7 +137,7 @@ $ne_ssl_cert_file           = "/etc/pki/tls/certs/${::fqdn}.crt.pem",
 $ne_ssl_privatekey_file     = "/etc/pki/tls/private/${::fqdn}.key.pem",
 $ne_ssl_client_certs        = '2',
 $ne_ssl_logging             = '0x00',
-$ne_nasty_metachars         = '"|`&><\'\\[]{};\r\n\"',
+$ne_nasty_metachars         = ["|`&><[]{};\n\'"],
 $ne_include_file            = '',

 # nrpe.conf