Merge branch 'jenkins' into 'master'

Jenkins See merge request !20
2017-07-28 19:32:33 +02:00
parent 9e080a988b 0b9b2ab85c
commit e948552c96
16 changed files with 30 additions and 86 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/2e1e26f44536a67">2e1e26f44536a67</a> Jenkins Server <i>2017-07-28 17:39:40</i>
+<p>
+<h3>recommit for updates in build 31</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a12b7f453353e15">a12b7f453353e15</a> Arne Teuke <i>2017-07-28 17:39:16</i>
+<p>
+<h3>updated template</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/edad1c298720d4b">edad1c298720d4b</a> Arne Teuke <i>2017-07-28 17:38:08</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:39:36 2017 by
+  Generated on Fri Jul 28 19:41: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:39:36 2017 by
+  Generated on Fri Jul 28 19:41: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:39:36 2017 by
+  Generated on Fri Jul 28 19:41: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/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:39:37 2017 by
+  Generated on Fri Jul 28 19:41: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_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:39:38 2017 by
+  Generated on Fri Jul 28 19:41: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_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:39:37 2017 by
+  Generated on Fri Jul 28 19:41: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:39:37 2017 by
+  Generated on Fri Jul 28 19:41: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_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:39:37 2017 by
+  Generated on Fri Jul 28 19:41: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:39:38 2017 by
+  Generated on Fri Jul 28 19:41: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:39:38 2017 by
+  Generated on Fri Jul 28 19:41: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_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:39:37 2017 by
+  Generated on Fri Jul 28 19:41: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:39:37 2017 by
+  Generated on Fri Jul 28 19:41: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_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:39:38 2017 by
+  Generated on Fri Jul 28 19:41: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/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 19:39:36 2017 by
+  Generated on Fri Jul 28 19:41: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
@@ -24,73 +24,13 @@ listen_queue_size=<%= @ne_listen_queue_size %>
 nrpe_user=<%= @ne_user %>
 nrpe_group=<%= @ne_user %>

+allowed_hosts=127.0.0.1,::1,<%= @ne_nagios_server %>
+dont_blame_nrpe=<%= @ne_dont_blame_nrpe %>
+allow_bash_command_substitution=<%= @ne_allow_bash_cmd_subst %>

-# ALLOWED HOST ADDRESSES
-# This is an optional comma-delimited list of IP address or hostnames
-# that are allowed to talk to the NRPE daemon. Network addresses with a bit mask
-# (i.e. 192.168.1.0/24) are also supported. Hostname wildcards are not currently
-# supported.
-#
-# Note: The daemon only does rudimentary checking of the client's IP
-# address. I would highly recommend adding entries in your /etc/hosts.allow
-# file to allow only the specified host to connect to the port
-# you are running this daemon on.
-#
-# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-
-allowed_hosts=127.0.0.1,::1
-
-
-# COMMAND ARGUMENT PROCESSING
-# This option determines whether or not the NRPE daemon will allow clients
-# to specify arguments to commands that are executed. This option only works
-# if the daemon was configured with the --enable-command-args configure script
-# option.
-#
-# *** ENABLING THIS OPTION IS A SECURITY RISK! ***
-# Read the SECURITY file for information on some of the security implications
-# of enabling this variable.
-#
-# Values: 0=do not allow arguments, 1=allow command arguments
-
-dont_blame_nrpe=0
-
-
-# BASH COMMAND SUBSTITUTION
-# This option determines whether or not the NRPE daemon will allow clients
-# to specify arguments that contain bash command substitutions of the form
-# $(...). This option only works if the daemon was configured with both
-# the --enable-command-args and --enable-bash-command-substitution configure
-# script options.
-#
-# *** ENABLING THIS OPTION IS A HIGH SECURITY RISK! ***
-# Read the SECURITY file for information on some of the security implications
-# of enabling this variable.
-#
-# Values: 0=do not allow bash command substitutions,
-# 1=allow bash command substitutions
-
-allow_bash_command_substitution=0
-
-
-# COMMAND PREFIX
-# This option allows you to prefix all commands with a user-defined string.
-# A space is automatically added between the specified prefix string and the
-# command line from the command definition.
-#
-# *** THIS EXAMPLE MAY POSE A POTENTIAL SECURITY RISK, SO USE WITH CAUTION! ***
-# Usage scenario:
-# Execute restricted commmands using sudo. For this to work, you need to add
-# the nagios user to your /etc/sudoers. An example entry for allowing
-# execution of the plugins from might be:
-#
-# nagios ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/
-#
-# This lets the nagios user run all commands in that directory (and only them)
-# without asking for a password. If you do this, make sure you don't give
-# random users write access to that directory or its contents!
-
-# command_prefix=/usr/bin/sudo
+<% if @ne_allow_sudo == true -%>
+command_prefix=<%= @ne_command_prefix %>
+<% end -%>


 # COMMAND TIMEOUT
@@ -247,13 +187,7 @@ command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 150 -c 200



-#allowed_hosts=127.0.0.1,::1,<%= @ne_nagios_server %>
-#dont_blame_nrpe=<%= @ne_dont_blame_nrpe %>
-#allow_bash_command_substitution=<%= @ne_allow_bash_cmd_subst %>

-#<% if @ne_allow_sudo == true -%>
-#command_prefix=<%= @ne_command_prefix %>
-#<% end -%>

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