Merge branch 'jenkins' into 'master'

Jenkins

See merge request !86
This commit is contained in:
12ww1160
2017-07-30 16:09:22 +02:00
40 changed files with 75 additions and 125 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/bede0046dc27177">bede0046dc27177</a> Jenkins Server <i>2017-07-30 14:09:52</i>
<p>
<h3>recommit for updates in build 147</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/ebdf85199f0f27d">ebdf85199f0f27d</a> Arne Teuke <i>2017-07-30 14:09:13</i>
<p>
<h3>changed user shell depending on role, on nagios server it requires bash access, else /sbin/nologin</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/e2c90593bb9918c">e2c90593bb9918c</a> Jenkins Server <i>2017-07-30 13:59:46</i>
<p>
<h3>recommit for updates in build 146</h3>

View File

@@ -1,6 +1,6 @@
|Repo Name| version | Build Status|
|---|---|---|---|
|`cd_nagios`| 0.0.1.4 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)|
|`cd_nagios`| 0.0.1.5 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)|
### Synopsis
Nagios is a powerful open source software solution for monitoring your IT environments.

View File

@@ -281,7 +281,7 @@
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:37 2017 by
Generated on Sun Jul 30 16:19: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>

View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build
Status|
|---|---|---|---|
|<code>cd_nagios</code>| 0.0.1.4 | <a
|<code>cd_nagios</code>| 0.0.1.5 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
Status</a>/]|</p>
@@ -408,7 +408,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Sun Jul 30 16:09:39 2017 by
Generated on Sun Jul 30 16:19: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>

View File

@@ -61,7 +61,7 @@
<p>|Repo Name| version | Build
Status|
|---|---|---|---|
|<code>cd_nagios</code>| 0.0.1.4 | <a
|<code>cd_nagios</code>| 0.0.1.5 | <a
href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
Status</a>/]|</p>
@@ -408,7 +408,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Sun Jul 30 16:09:38 2017 by
Generated on Sun Jul 30 16:19: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>

View File

@@ -139,7 +139,7 @@ class cd_nagios {
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:39 2017 by
Generated on Sun Jul 30 16:19: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>

View File

@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:03 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

@@ -378,7 +378,7 @@ class cd_nagios::client::target (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:04 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

@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:04 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

@@ -195,7 +195,7 @@ class cd_nagios::main::config (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:03 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

@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:43 2017 by
Generated on Sun Jul 30 16:20:03 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

@@ -213,7 +213,7 @@ class cd_nagios::main::install (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:03 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

@@ -155,27 +155,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69</pre>
49</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/user.pp', line 23</span>
@@ -193,25 +173,6 @@ class cd_nagios::main::user (
allowdupe =&gt; false,
}
if $::fqdn == $ng_nagios_server {
user { $ng_user:
ensure =&gt; present,
name =&gt; $ng_user,
allowdupe =&gt; false,
comment =&gt; $ng_u_comment,
uid =&gt; $ng_u_uid,
gid =&gt; $ng_user,
groups =&gt; $ng_u_groups,
managehome =&gt; true,
home =&gt; $ng_user_home,
shell =&gt; &#39;/bin/bash&#39;,
require =&gt; Group[$ng_user],
}
}
else {
user { $ng_user:
ensure =&gt; present,
name =&gt; $ng_user,
@@ -225,7 +186,6 @@ class cd_nagios::main::user (
shell =&gt; $ng_user_shell,
require =&gt; Group[$ng_user],
}
}
}</pre>
</td>
</tr>
@@ -234,7 +194,7 @@ class cd_nagios::main::user (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:03 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_nagios::nagios::objects::add_contact_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:45 2017 by
Generated on Sun Jul 30 16:20:05 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

@@ -215,7 +215,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:46 2017 by
Generated on Sun Jul 30 16:20:05 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

@@ -214,7 +214,7 @@ class cd_nagios::nagios::objects::add_hostgroup_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:45 2017 by
Generated on Sun Jul 30 16:20:05 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

@@ -224,7 +224,7 @@ class cd_nagios::nagios::objects::add_servicegroup_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:46 2017 by
Generated on Sun Jul 30 16:20:05 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

@@ -222,7 +222,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:46 2017 by
Generated on Sun Jul 30 16:20:05 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

@@ -597,7 +597,7 @@ class cd_nagios::nagios::objects::commands (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:45 2017 by
Generated on Sun Jul 30 16:20:04 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

@@ -182,7 +182,7 @@ class cd_nagios::nagios::objects::config (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:04 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

@@ -237,7 +237,7 @@ class cd_nagios::nagios::objects::contactgroups (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:45 2017 by
Generated on Sun Jul 30 16:20:05 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

@@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:45 2017 by
Generated on Sun Jul 30 16:20:04 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

@@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:45 2017 by
Generated on Sun Jul 30 16:20:04 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

@@ -235,7 +235,7 @@ class cd_nagios::nagios::objects::servicegroups (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:45 2017 by
Generated on Sun Jul 30 16:20:05 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

@@ -305,7 +305,7 @@ class cd_nagios::nagios::objects::template_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:45 2017 by
Generated on Sun Jul 30 16:20:05 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

@@ -285,7 +285,7 @@ class cd_nagios::nagios::objects::timeperiods (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:45 2017 by
Generated on Sun Jul 30 16:20:04 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

@@ -5632,7 +5632,7 @@ $ng_nrpe_file = &quot;${ng_main_dir}/nrpe.cfg&quot;
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:43 2017 by
Generated on Sun Jul 30 16:20:03 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

@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:04 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

@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:04 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

@@ -334,7 +334,7 @@ class cd_nagios::server::files (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:03 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

@@ -310,7 +310,7 @@ class cd_nagios::server::service (
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:44 2017 by
Generated on Sun Jul 30 16:20:04 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

@@ -285,7 +285,7 @@ $ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:46 2017 by
Generated on Sun Jul 30 16:20:06 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

@@ -237,7 +237,7 @@ $ng_cntctgrps_rule_erb = $::cd_nagios::params::ng_cntctgrps_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:47 2017 by
Generated on Sun Jul 30 16:20:06 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

@@ -245,7 +245,7 @@ $ng_tgt_hostgrp_rule_erb = $::cd_nagios::params::ng_tgt_hostgrp_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:47 2017 by
Generated on Sun Jul 30 16:20:06 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

@@ -245,7 +245,7 @@ $ng_tgt_svcgrp_rule_erb = $::cd_nagios::params::ng_tgt_svcgrp_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:47 2017 by
Generated on Sun Jul 30 16:20:07 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

@@ -370,7 +370,7 @@ $ng_tgt_timep_rule_erb = $::cd_nagios::params::ng_tgt_timep_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:47 2017 by
Generated on Sun Jul 30 16:20:06 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

@@ -906,7 +906,7 @@ $ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:46 2017 by
Generated on Sun Jul 30 16:20:06 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

@@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service
</div>
<div id="footer">
Generated on Sun Jul 30 16:09:46 2017 by
Generated on Sun Jul 30 16:20:05 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 Sun Jul 30 16:09:39 2017 by
Generated on Sun Jul 30 16:19: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>

View File

@@ -33,25 +33,6 @@ class cd_nagios::main::user (
allowdupe => false,
}
if $::fqdn == $ng_nagios_server {
user { $ng_user:
ensure => present,
name => $ng_user,
allowdupe => false,
comment => $ng_u_comment,
uid => $ng_u_uid,
gid => $ng_user,
groups => $ng_u_groups,
managehome => true,
home => $ng_user_home,
shell => '/bin/bash',
require => Group[$ng_user],
}
}
else {
user { $ng_user:
ensure => present,
name => $ng_user,
@@ -65,5 +46,4 @@ class cd_nagios::main::user (
shell => $ng_user_shell,
require => Group[$ng_user],
}
}
}