Merge branch 'jenkins' into 'master'

Jenkins See merge request !6
2017-07-28 18:01:35 +02:00
parent 6b0496bd33 156bce6ccc
commit d76d4ad2ae
19 changed files with 29 additions and 19 deletions
--- a/CHANGELOG.md
+++ b/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/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>
 <p>
 <h3>syntax</h3>
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -44,7 +44,7 @@
 |   |-- init.pp
 |   `-- params.pp
 |-- templates
-|   `-- nrpe_cfg_head.erb
+|   `-- nrpe_cfg.erb
 |-- tests
 |   `-- UTF_Files
 |-- CHANGELOG.md
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -166,7 +166,7 @@
 </div>

      <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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -241,7 +241,7 @@ environments.</p>
 </div></div>

      <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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/index.html
+++ b/doc/index.html
@@ -241,7 +241,7 @@ environments.</p>
 </div></div>

      <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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_nrpe.html
+++ b/doc/puppet_classes/cd_nrpe.html
@@ -140,7 +140,7 @@ class cd_nrpe {
 </div>

      <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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
+++ b/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 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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html
+++ b/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 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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html
+++ b/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 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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
@@ -169,7 +169,7 @@ class cd_nrpe::main::files (
    selrole   =&gt;  object_r,
    seltype   =&gt;  nrpe_etc_t,
    seluser   =&gt;  system_u,
-    content   =&gt;  template($ne_main_conf_file),
+    content   =&gt;  template($ne_nrpe_conf_erb),
    notify    =&gt;  Service[$ne_service],
  }

@@ -181,7 +181,7 @@ class cd_nrpe::main::files (
 </div>

      <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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html
+++ b/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 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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html
+++ b/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 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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html
+++ b/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 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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
@@ -945,7 +945,7 @@ $ne_run_dir                 = &#39;/var/run/nrpe&#39;

 # files
 $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;

 # includes must be last
@@ -960,7 +960,7 @@ $ne_nrpe_pid_file           = &quot;${ne_run_dir}/nrpe.pid&quot;
 </div>

      <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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
+++ b/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 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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <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>
  0.9.9 (ruby-2.0.0).
 </div>
--- a/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -36,7 +36,7 @@ class cd_nrpe::main::files (
    selrole   =>  object_r,
    seltype   =>  nrpe_etc_t,
    seluser   =>  system_u,
-    content   =>  template($ne_main_conf_file),
+    content   =>  template($ne_nrpe_conf_erb),
    notify    =>  Service[$ne_service],
  }

--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -147,7 +147,7 @@ $ne_run_dir                 = '/var/run/nrpe'

 # files
 $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"

 # includes must be last
--- a/templates/nrpe_cfg_head.erb
+++ b/templates/nrpe_cfg_head.erb