Merge branch 'jenkins' into 'master'

Jenkins

See merge request !12
This commit is contained in:
12ww1160
2017-07-28 18:57:13 +02:00
17 changed files with 84 additions and 82 deletions

View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2> <h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/c4c512987a9e30d">c4c512987a9e30d</a> Arne Teuke <i>2017-07-28 16:58:53</i>
<p>
<h3>adding user</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/57c5bb01cf9a421">57c5bb01cf9a421</a> Jenkins Server <i>2017-07-28 16:58:47</i>
<p>
<h3>recommit for updates in build 21</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/9799202bcdcbd53">9799202bcdcbd53</a> Arne Teuke <i>2017-07-28 16:54:42</i> <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/9799202bcdcbd53">9799202bcdcbd53</a> Arne Teuke <i>2017-07-28 16:54:42</i>
<p> <p>
<h3>troubleshooting service</h3> <h3>troubleshooting service</h3>

View File

@@ -166,7 +166,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:42 2017 by Generated on Fri Jul 28 19:06:28 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -252,7 +252,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:43 2017 by Generated on Fri Jul 28 19:06:29 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -252,7 +252,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:43 2017 by Generated on Fri Jul 28 19:06:29 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -140,7 +140,7 @@ class cd_nrpe {
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:43 2017 by Generated on Fri Jul 28 19:06:30 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -165,7 +165,7 @@ class cd_nrpe::firewall::iptables (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:45 2017 by Generated on Fri Jul 28 19:06:31 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -154,7 +154,7 @@ class cd_nrpe::main::config (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:44 2017 by Generated on Fri Jul 28 19:06:30 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -205,7 +205,7 @@ class cd_nrpe::main::dirs (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:44 2017 by Generated on Fri Jul 28 19:06:30 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -217,7 +217,7 @@ class cd_nrpe::main::files (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:44 2017 by Generated on Fri Jul 28 19:06:30 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -160,7 +160,7 @@ class cd_nrpe::main::install (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:44 2017 by Generated on Fri Jul 28 19:06:30 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -158,7 +158,7 @@ class cd_nrpe::main::service (
require cd_nrpe::firewall::iptables require cd_nrpe::firewall::iptables
} }
require cd_nrpe::main::user require cd_nrpe::main::dirs
service { $ne_service: service { $ne_service:
ensure =&gt; running, ensure =&gt; running,
@@ -175,7 +175,7 @@ class cd_nrpe::main::service (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:44 2017 by Generated on Fri Jul 28 19:06:31 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -193,7 +193,7 @@ class cd_nrpe::main::user (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:44 2017 by Generated on Fri Jul 28 19:06:30 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -133,7 +133,8 @@ for more details.</p>
with this program. If not, see <a with this program. If not, see <a
href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/. href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.
be passed to be passed to
the NRPE daemon.</p> the NRPE daemon.
~param [string] ne_user_home the home for the service user</p>
</div> </div>
</div> </div>
@@ -340,12 +341,14 @@ sudo role.</p>
<li> <li>
<span class='name'>command_prefix</span> <span class='name'>ne_command_prefix</span>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/usr/bin/sudo&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -517,16 +520,18 @@ must include full path.</p>
<li> <li>
<span class='name'>ne_ssl_privatekey_filepath</span> <span class='name'>ne_ssl_privatekey_file</span>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&quot;/etc/pki/tls/private/${::fqdn}.key.pem&quot;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
<p>and name of the server ssl <p>path and name of the server ssl
private key. Must include full path.</p> private key. Must include full path.</p>
</div> </div>
@@ -623,17 +628,6 @@ one
config file.</p> config file.</p>
</div> </div>
</li>
<li>
<span class='name'>ne_include_dir</span>
<span class='type'>(<tt>string</tt>)</span>
</li> </li>
<li> <li>
@@ -679,12 +673,17 @@ needed.</p>
<span class='name'>ne_user</span> <span class='name'>ne_user</span>
<span class='type'>(<tt>Any</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;nrpe&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;nrpe&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the NRPE service user</p>
</div>
</li> </li>
<li> <li>
@@ -692,12 +691,17 @@ needed.</p>
<span class='name'>ne_user_comment</span> <span class='name'>ne_user_comment</span>
<span class='type'>(<tt>Any</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;NRPE service user&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;NRPE service user&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The comment for the service user /etc/passwd</p>
</div>
</li> </li>
<li> <li>
@@ -705,12 +709,35 @@ needed.</p>
<span class='name'>ne_user_uid</span> <span class='name'>ne_user_uid</span>
<span class='type'>(<tt>Any</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1005&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;1005&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the UID for the service user</p>
</div>
</li>
<li>
<span class='name'>ne_user_shell</span>
<span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/sbin/nologin&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the shell for the service user.</p>
</div>
</li> </li>
<li> <li>
@@ -737,19 +764,6 @@ needed.</p>
<em class="default">(defaults to: <tt>undef</tt>)</em> <em class="default">(defaults to: <tt>undef</tt>)</em>
</li>
<li>
<span class='name'>ne_user_shell</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/sbin/nologin&#39;</tt>)</em>
</li> </li>
<li> <li>
@@ -763,19 +777,6 @@ needed.</p>
<em class="default">(defaults to: <tt>&#39;127.0.0.1&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;127.0.0.1&#39;</tt>)</em>
</li>
<li>
<span class='name'>ne_command_prefix</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/usr/bin/sudo&#39;</tt>)</em>
</li> </li>
<li> <li>
@@ -789,19 +790,6 @@ needed.</p>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em> <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
</li>
<li>
<span class='name'>ne_ssl_privatekey_file</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&quot;/etc/pki/tls/private/${::fqdn}.key.pem&quot;</tt>)</em>
</li> </li>
<li> <li>
@@ -834,10 +822,6 @@ needed.</p>
<pre class="lines"> <pre class="lines">
90
91
92
93
94 94
95 95
96 96
@@ -908,10 +892,14 @@ needed.</p>
161 161
162 162
163 163
164</pre> 164
165
166
167
168</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 90</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 94</span>
class cd_nrpe::params ( class cd_nrpe::params (
@@ -995,7 +983,7 @@ $ne_nrpe_conf_erb = &#39;cd_nrpe/nrpe_conf.erb&#39;
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:44 2017 by Generated on Fri Jul 28 19:06:30 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -148,7 +148,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:45 2017 by Generated on Fri Jul 28 19:06:31 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -90,7 +90,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:58:43 2017 by Generated on Fri Jul 28 19:06:29 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

View File

@@ -28,7 +28,7 @@ class cd_nrpe::main::service (
require cd_nrpe::firewall::iptables require cd_nrpe::firewall::iptables
} }
require cd_nrpe::main::user require cd_nrpe::main::dirs
service { $ne_service: service { $ne_service:
ensure => running, ensure => running,

View File

@@ -43,7 +43,7 @@
# of the form $(...). # of the form $(...).
# @param [boolean] ne_allow_sudo Whether to allow sudo access. used in nrpe.cfg # @param [boolean] ne_allow_sudo Whether to allow sudo access. used in nrpe.cfg
# as well as for creating a sudo role. # as well as for creating a sudo role.
# @param [string] command_prefix allows you to prefix all commands with a # @param [string] ne_command_prefix allows you to prefix all commands with a
# user-defined string. # user-defined string.
# @param [string] ne_incl_fw Whether to include firewall rules # @param [string] ne_incl_fw Whether to include firewall rules
# @param [string] ne_command_timeout maximum number of seconds that the NRPE # @param [string] ne_command_timeout maximum number of seconds that the NRPE
@@ -62,7 +62,7 @@
# authority ( ca) file / chain. must be full path. # authority ( ca) file / chain. must be full path.
# @param [string] ne_ssl_cert_file path and name of the server ssl certificate. # @param [string] ne_ssl_cert_file path and name of the server ssl certificate.
# must include full path. # must include full path.
# @param [string] ne_ssl_privatekey_filepath and name of the server ssl # @param [string] ne_ssl_privatekey_file path and name of the server ssl
# private key. Must include full path. # private key. Must include full path.
# @param [string] ne_ssl_client_certs determines client certificate usage. # @param [string] ne_ssl_client_certs determines client certificate usage.
# Values: 0 = Don't ask for or require client certificates # Values: 0 = Don't ask for or require client certificates
@@ -82,10 +82,14 @@
# be passed to the NRPE daemon. # be passed to the NRPE daemon.
# @param [string] ne_include_file include definitions from an external # @param [string] ne_include_file include definitions from an external
# config file. # config file.
# @param [string] ne_include_dir
# @param [string] ne_fw_order_no ordering prefix for he firewall rules. Adjust # @param [string] ne_fw_order_no ordering prefix for he firewall rules. Adjust
# to your environment if needed. # to your environment if needed.
# @param [string] ne_ssl_opts Specify additional SSL options. # @param [string] ne_ssl_opts Specify additional SSL options.
# @param [string] ne_user the NRPE service user
# @param [string] ne_user_comment The comment for the service user /etc/passwd
# @param [string] ne_user_uid the UID for the service user
# ~param [string] ne_user_home the home for the service user
# @param [string] ne_user_shell the shell for the service user.
############################################################################### ###############################################################################
class cd_nrpe::params ( class cd_nrpe::params (