Merge branch 'jenkins' into 'master'

Jenkins

See merge request !18

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/66fb39d51afc34f">66fb39d51afc34f</a> Arne Teuke <i>2017-07-28 17:35:26</i>
+<p>
+<h3>updated template</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d35d9bef8f56aac">d35d9bef8f56aac</a> Jenkins Server <i>2017-07-28 17:35:20</i>
+<p>
+<h3>recommit for updates in build 29</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/2843c571eac1e5c">2843c571eac1e5c</a> Arne Teuke <i>2017-07-28 17:32:57</i>
 <p>
 <h3>updated template</h3>

doc/_index.html

@@ -166,7 +166,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 28 19:35:15 2017 by
+  Generated on Fri Jul 28 19:37: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>

doc/file.README.html

@@ -252,7 +252,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Fri Jul 28 19:35:16 2017 by
+  Generated on Fri Jul 28 19:37:59 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>

doc/index.html

@@ -252,7 +252,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Fri Jul 28 19:35:16 2017 by
+  Generated on Fri Jul 28 19:37: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>

doc/puppet_classes/cd_nrpe.html

@@ -140,7 +140,7 @@ class cd_nrpe {
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 28 19:35:16 2017 by
+  Generated on Fri Jul 28 19:37:59 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>

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:35:17 2017 by
+  Generated on Fri Jul 28 19:38:00 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>

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:35:17 2017 by
+  Generated on Fri Jul 28 19:38:00 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>

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:35:17 2017 by
+  Generated on Fri Jul 28 19:38:00 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>

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:35:17 2017 by
+  Generated on Fri Jul 28 19:38:00 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>

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:35:17 2017 by
+  Generated on Fri Jul 28 19:38:00 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>

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:35:17 2017 by
+  Generated on Fri Jul 28 19:38:00 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>

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:35:17 2017 by
+  Generated on Fri Jul 28 19:38:00 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>

doc/puppet_classes/cd_nrpe_3A_3Aparams.html

@@ -1007,7 +1007,7 @@ $ne_nrpe_conf_erb           = 'cd_nrpe/nrpe_conf.erb'
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 28 19:35:17 2017 by
+  Generated on Fri Jul 28 19:38:00 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>

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:35:17 2017 by
+  Generated on Fri Jul 28 19:38:00 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>

doc/top-level-namespace.html

@@ -90,7 +90,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 28 19:35:16 2017 by
+  Generated on Fri Jul 28 19:37:59 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>

templates/nrpe_cfg.erb

@@ -14,21 +14,8 @@ log_file=<%= @ne_log_file %>
 
 debug=<%= @ne_debug %>
 
-
+pid_file=<%= @ne_nrpe_pid_file %>
-# PID FILE
+server_port=<%= @ne_nrpe_port %>
-# The name of the file in which the NRPE daemon should write it's process ID
-# number. The file is only written if the NRPE daemon is started by the root
-# user and is running in standalone mode.
-
-pid_file=/var/run/nrpe/nrpe.pid
-
-
-# PORT NUMBER
-# Port number we should wait for connections on.
-# NOTE: This must be a non-privileged port (i.e. > 1024).
-# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
-
-server_port=5666
 
 
 # SERVER ADDRESS
@@ -284,9 +271,6 @@ command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 150 -c 200
 #####################################
 
 
-#pid_file=<%= @ne_nrpe_pid_file %>
-#server_port=<%= @ne_nrpe_port %>
-
 #server_address=<%= @ne_server_address %>
 #listen_queue_size=<%= @ne_listen_queue_size %>