Merge branch 'jenkins' into 'master'

Jenkins See merge request !7
2017-07-28 18:21:31 +02:00
parent d76d4ad2ae bc16eff165
commit a2c01602d6
18 changed files with 93 additions and 18 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/b962ee1a2a6d02e">b962ee1a2a6d02e</a> Arne Teuke <i>2017-07-28 16:12:11</i>
+<p>
+<h3>typo</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/156bce6ccc321e1">156bce6ccc321e1</a> Jenkins Server <i>2017-07-28 16:12:04</i>
+<p>
+<h3>recommit for updates in build 15</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/28c39998ec3a6b2">28c39998ec3a6b2</a> Arne Teuke <i>2017-07-28 16:11:18</i>
+<p>
+<h3>typo</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/2051415f9e80886">2051415f9e80886</a> Arne Teuke <i>2017-07-28 16:05:03</i>
 <p>
 <h3>syntax</h3>
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -44,7 +44,8 @@
 |   |-- init.pp
 |   `-- params.pp
 |-- templates
-|   `-- nrpe_cfg.erb
+|   |-- nrpe_cfg.erb
+|   `-- nrpe_cfg_head.erb
 |-- tests
 |   `-- UTF_Files
 |-- CHANGELOG.md
@@ -55,4 +56,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md

-11 directories, 44 files
+11 directories, 45 files
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -166,7 +166,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:12:00 2017 by
+  Generated on Fri Jul 28 18:31:41 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
@@ -241,7 +241,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 28 18:12:01 2017 by
+  Generated on Fri Jul 28 18:31:42 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
@@ -241,7 +241,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 28 18:12:00 2017 by
+  Generated on Fri Jul 28 18:31:42 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 18:12:01 2017 by
+  Generated on Fri Jul 28 18:31:42 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 18:12:02 2017 by
+  Generated on Fri Jul 28 18:31:44 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 18:12:02 2017 by
+  Generated on Fri Jul 28 18:31:43 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 18:12:01 2017 by
+  Generated on Fri Jul 28 18:31:43 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
@@ -181,7 +181,7 @@ class cd_nrpe::main::files (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:12:02 2017 by
+  Generated on Fri Jul 28 18:31:43 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 18:12:02 2017 by
+  Generated on Fri Jul 28 18:31:43 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 18:12:02 2017 by
+  Generated on Fri Jul 28 18:31:43 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 18:12:01 2017 by
+  Generated on Fri Jul 28 18:31:43 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
@@ -933,7 +933,7 @@ $ne_include_selinux         = true,

 # installation section
 $reqpackages  = $::operatingsystem ? {
-    /(?i-mx:centos|fedora|redhat)/ =&gt; [&#39;nrpe&#39;],
+    /(?i-mx:centos|fedora|redhat)/ =&gt; [&#39;nrpe&#39;,&#39;nrpe-selinux&#39;],
  }

 # service
@@ -960,7 +960,7 @@ $ne_nrpe_pid_file           = &quot;${ne_run_dir}/nrpe.pid&quot;
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:12:01 2017 by
+  Generated on Fri Jul 28 18:31:43 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 18:12:02 2017 by
+  Generated on Fri Jul 28 18:31:44 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 18:12:01 2017 by
+  Generated on Fri Jul 28 18:31:42 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
@@ -135,7 +135,7 @@ $ne_include_selinux         = true,

 # installation section
 $reqpackages  = $::operatingsystem ? {
-    /(?i-mx:centos|fedora|redhat)/ => ['nrpe'],
+    /(?i-mx:centos|fedora|redhat)/ => ['nrpe','nrpe-selinux'],
  }

 # service
--- a/templates/nrpe_cfg_head.erb
+++ b/templates/nrpe_cfg_head.erb
@@ -0,0 +1,59 @@
+################################################################################
+##########                nrpe.cfg managed by Puppet                  ##########
+##########            manual changes will be overwritten !!!          ##########
+################################################################################
+##########          full reference is available at                    ##########
+##########      https://confdroid.com/2017/07/nrpe-nrpe-cfg/          ##########
+################################################################################
+
+log_facility=<%= @ne_log_facility %>
+
+<% unless @ne_log_file.empty? -%>
+log_file=<%= @ne_log_file %>
+<% end -%>
+
+debug=<%= @ne_debug %>
+
+pid_file=<% @ne_nrpe_pid_file %>
+server_port=<%= @ne_nrpe_port %>
+
+server_address=<%= @ne_server_address %>
+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 %>
+
+<% if @ne_allow_sudo == true -%>
+command_prefix=<%= @ne_command_prefix %>
+<% end -%>
+
+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 %>
+ssl_cipher_list=<%= @ne_ssl_cipher_list %>
+
+ssl_cacert_file=<%= @ne_ssl_cacert_file %>
+ssl_cert_file=<%= @ne_ssl_cert_file %>
+ssl_privatekey_file=<%= @ne_ssl_privatekey_file %>
+
+ssl_client_certs=<%= @ne_ssl_client_certs %>
+ssl_logging=<%= @ne_ssl_logging %>
+
+nasty_metachars=<%= @ne_nasty_metachars  %>
+
+<% unless @ne_include_file.empty? -%>
+include=<%= @ne_include_file %>
+<% end -%>
+
+include_dir=<%= @ne_main_conf_d_dir  %>
+
+### command definitions have been moved to include_dir for easier external
+#   management