Merge branch 'jenkins' into 'master'

Jenkins See merge request !11
2017-07-28 18:48:37 +02:00
parent cc0fabb4c2 57c5bb01cf
commit 8b0f70f10a
16 changed files with 26 additions and 16 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/9799202bcdcbd53">9799202bcdcbd53</a> Arne Teuke <i>2017-07-28 16:54:42</i>
+<p>
+<h3>troubleshooting service</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/af92ee8bd64f78c">af92ee8bd64f78c</a> Jenkins Server <i>2017-07-28 16:54:36</i>
+<p>
+<h3>recommit for updates in build 20</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/09c00735a0a8080">09c00735a0a8080</a> Jenkins Server <i>2017-07-28 16:41:56</i>
 <p>
 <h3>recommit for updates in build 19</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -166,7 +166,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:54:32 2017 by
+  Generated on Fri Jul 28 18:58:42 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
@@ -252,7 +252,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 28 18:54:33 2017 by
+  Generated on Fri Jul 28 18:58:43 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
@@ -252,7 +252,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 28 18:54:33 2017 by
+  Generated on Fri Jul 28 18:58:43 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:54:33 2017 by
+  Generated on Fri Jul 28 18:58:43 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:54:34 2017 by
+  Generated on Fri Jul 28 18:58:45 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:54:34 2017 by
+  Generated on Fri Jul 28 18:58:44 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:54:34 2017 by
+  Generated on Fri Jul 28 18:58:44 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
@@ -217,7 +217,7 @@ class cd_nrpe::main::files (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:54:34 2017 by
+  Generated on Fri Jul 28 18:58:44 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:54:34 2017 by
+  Generated on Fri Jul 28 18:58:44 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
@@ -158,7 +158,7 @@ class cd_nrpe::main::service (
    require cd_nrpe::firewall::iptables
  }

-  require cd_nrpe::main::install
+  require cd_nrpe::main::user

  service { $ne_service:
    ensure      =&gt; running,
@@ -175,7 +175,7 @@ class cd_nrpe::main::service (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:54:34 2017 by
+  Generated on Fri Jul 28 18:58:44 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:54:34 2017 by
+  Generated on Fri Jul 28 18:58:44 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
@@ -995,7 +995,7 @@ $ne_nrpe_conf_erb           = &#39;cd_nrpe/nrpe_conf.erb&#39;
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:54:34 2017 by
+  Generated on Fri Jul 28 18:58:44 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:54:35 2017 by
+  Generated on Fri Jul 28 18:58:45 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:54:33 2017 by
+  Generated on Fri Jul 28 18:58:43 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/service.pp
+++ b/manifests/main/service.pp
@@ -28,7 +28,7 @@ class cd_nrpe::main::service (
    require cd_nrpe::firewall::iptables
  }

-  require cd_nrpe::main::install
+  require cd_nrpe::main::user

  service { $ne_service:
    ensure      => running,