Merge branch 'jenkins' into 'master'

Jenkins

See merge request !19
This commit is contained in:
12ww1160
2017-07-28 19:30:21 +02:00
16 changed files with 28 additions and 48 deletions

View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<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>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d4705499bb8cfb5">d4705499bb8cfb5</a> Jenkins Server <i>2017-07-28 17:38:03</i>
<p>
<h3>recommit for updates in build 30</h3>
</p>
<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>

View File

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

View File

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

View File

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

View File

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

View File

@@ -165,7 +165,7 @@ class cd_nrpe::firewall::iptables (
</div>
<div id="footer">
Generated on Fri Jul 28 19:38:00 2017 by
Generated on Fri Jul 28 19:39:38 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>

View File

@@ -154,7 +154,7 @@ class cd_nrpe::main::config (
</div>
<div id="footer">
Generated on Fri Jul 28 19:38:00 2017 by
Generated on Fri Jul 28 19:39:37 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>

View File

@@ -205,7 +205,7 @@ class cd_nrpe::main::dirs (
</div>
<div id="footer">
Generated on Fri Jul 28 19:38:00 2017 by
Generated on Fri Jul 28 19:39:37 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>

View File

@@ -217,7 +217,7 @@ class cd_nrpe::main::files (
</div>
<div id="footer">
Generated on Fri Jul 28 19:38:00 2017 by
Generated on Fri Jul 28 19:39:37 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>

View File

@@ -160,7 +160,7 @@ class cd_nrpe::main::install (
</div>
<div id="footer">
Generated on Fri Jul 28 19:38:00 2017 by
Generated on Fri Jul 28 19:39:38 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>

View File

@@ -175,7 +175,7 @@ class cd_nrpe::main::service (
</div>
<div id="footer">
Generated on Fri Jul 28 19:38:00 2017 by
Generated on Fri Jul 28 19:39:38 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>

View File

@@ -193,7 +193,7 @@ class cd_nrpe::main::user (
</div>
<div id="footer">
Generated on Fri Jul 28 19:38:00 2017 by
Generated on Fri Jul 28 19:39:37 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>

View File

@@ -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:38:00 2017 by
Generated on Fri Jul 28 19:39:37 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>

View File

@@ -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:38:00 2017 by
Generated on Fri Jul 28 19:39:38 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>

View File

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

View File

@@ -18,37 +18,11 @@ pid_file=<%= @ne_nrpe_pid_file %>
server_port=<%= @ne_nrpe_port %>
# SERVER ADDRESS
# Address that nrpe should bind to in case there are more than one interface
# and you do not want nrpe to bind on all interfaces.
# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
server_address=<%= @ne_server_address %>
listen_queue_size=<%= @ne_listen_queue_size %>
#server_address=127.0.0.1
# LISTEN QUEUE SIZE
# Listen queue size (backlog) for serving incoming connections.
# You may want to increase this value under high load.
#listen_queue_size=5
# NRPE USER
# This determines the effective user that the NRPE daemon should run as.
# You can either supply a username or a UID.
#
# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
nrpe_user=nrpe
# NRPE GROUP
# This determines the effective group that the NRPE daemon should run as.
# You can either supply a group name or a GID.
#
# NOTE: This option is ignored if NRPE is running under either inetd or xinetd
nrpe_group=nrpe
nrpe_user=<%= @ne_user %>
nrpe_group=<%= @ne_user %>
# ALLOWED HOST ADDRESSES
@@ -271,11 +245,7 @@ command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 150 -c 200
#####################################
#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 %>