confdroid/confdroid_nrpe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'jenkins' into 'master'

Browse Source 
Jenkins

See merge request !6
This commit is contained in:
12ww1160
2017-07-28 18:01:35 +02:00
parent 6b0496bd33 156bce6ccc
commit d76d4ad2ae
19 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
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/2051415f9e80886">2051415f9e80886</a> Arne Teuke <i>2017-07-28 16:05:03</i>
<p>
<h3>syntax</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/77229e2b0398b3e">77229e2b0398b3e</a> Jenkins Server <i>2017-07-28 16:05:00</i>
<p>
<h3>recommit for updates in build 13</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/ff5a3faf9e8e142">ff5a3faf9e8e142</a> Arne Teuke <i>2017-07-28 15:58:16</i> <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/ff5a3faf9e8e142">ff5a3faf9e8e142</a> Arne Teuke <i>2017-07-28 15:58:16</i>
<p> <p>
<h3>syntax</h3> <h3>syntax</h3>

2
REPOSTRUCTURE.md
View File

@@ -44,7 +44,7 @@
| |-- init.pp | |-- init.pp
| `-- params.pp | `-- params.pp
|-- templates |-- templates
| `-- nrpe_cfg_head.erb | `-- nrpe_cfg.erb
|-- tests |-- tests
| `-- UTF_Files | `-- UTF_Files
|-- CHANGELOG.md |-- CHANGELOG.md

2
doc/_index.html
View File

@@ -166,7 +166,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:04:55 2017 by Generated on Fri Jul 28 18:12:00 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>

2
doc/file.README.html
View File

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

2
doc/index.html
View File

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

2
doc/puppet_classes/cd_nrpe.html
View File

@@ -140,7 +140,7 @@ class cd_nrpe {
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:04:56 2017 by Generated on Fri Jul 28 18:12:01 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>

2
doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
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:04:57 2017 by Generated on Fri Jul 28 18:12:02 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>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html
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:04:57 2017 by Generated on Fri Jul 28 18:12:02 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>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html
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:04:57 2017 by Generated on Fri Jul 28 18:12:01 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>

4
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
View File

@@ -169,7 +169,7 @@ class cd_nrpe::main::files (
selrole =&gt; object_r, selrole =&gt; object_r,
seltype =&gt; nrpe_etc_t, seltype =&gt; nrpe_etc_t,
seluser =&gt; system_u, seluser =&gt; system_u,
content =&gt; template($ne_main_conf_file), content =&gt; template($ne_nrpe_conf_erb),
notify =&gt; Service[$ne_service], notify =&gt; Service[$ne_service],
} }
@@ -181,7 +181,7 @@ class cd_nrpe::main::files (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:04:57 2017 by Generated on Fri Jul 28 18:12:02 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>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html
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:04:57 2017 by Generated on Fri Jul 28 18:12:02 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>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html
View File

@@ -175,7 +175,7 @@ class cd_nrpe::main::service (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:04:57 2017 by Generated on Fri Jul 28 18:12:02 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>

2
doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html
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:04:57 2017 by Generated on Fri Jul 28 18:12:01 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>

4
doc/puppet_classes/cd_nrpe_3A_3Aparams.html
View File

@@ -945,7 +945,7 @@ $ne_run_dir = &#39;/var/run/nrpe&#39;
# files # files
$ne_main_conf_file = &#39;/etc/nagios/nrpe.cfg&#39; $ne_main_conf_file = &#39;/etc/nagios/nrpe.cfg&#39;
$ne_nrpe_conf_head_erb = &#39;cd_nrpe/nrpe_cfg_head.erb&#39; $ne_nrpe_conf_erb = &#39;cd_nrpe/nrpe_cfg.erb&#39;
$ne_nrpe_pid_file = &quot;${ne_run_dir}/nrpe.pid&quot; $ne_nrpe_pid_file = &quot;${ne_run_dir}/nrpe.pid&quot;
# includes must be last # includes must be last
@@ -960,7 +960,7 @@ $ne_nrpe_pid_file = &quot;${ne_run_dir}/nrpe.pid&quot;
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:04:57 2017 by Generated on Fri Jul 28 18:12:01 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>

2
doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
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:04:58 2017 by Generated on Fri Jul 28 18:12:02 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>

2
doc/top-level-namespace.html
View File

@@ -90,7 +90,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Fri Jul 28 18:04:56 2017 by Generated on Fri Jul 28 18:12:01 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>

2
manifests/main/files.pp
View File

@@ -36,7 +36,7 @@ class cd_nrpe::main::files (
selrole => object_r, selrole => object_r,
seltype => nrpe_etc_t, seltype => nrpe_etc_t,
seluser => system_u, seluser => system_u,
content => template($ne_main_conf_file), content => template($ne_nrpe_conf_erb),
notify => Service[$ne_service], notify => Service[$ne_service],
} }

2
manifests/params.pp
View File

@@ -147,7 +147,7 @@ $ne_run_dir = '/var/run/nrpe'
# files # files
$ne_main_conf_file = '/etc/nagios/nrpe.cfg' $ne_main_conf_file = '/etc/nagios/nrpe.cfg'
$ne_nrpe_conf_head_erb = 'cd_nrpe/nrpe_cfg_head.erb' $ne_nrpe_conf_erb = 'cd_nrpe/nrpe_cfg.erb'
$ne_nrpe_pid_file = "${ne_run_dir}/nrpe.pid" $ne_nrpe_pid_file = "${ne_run_dir}/nrpe.pid"
# includes must be last # includes must be last

0
templates/nrpe_cfg_head.erb → templates/nrpe_cfg.erb
View File