Merge branch 'jenkins' into 'master'

Jenkins See merge request !5
2017-07-28 17:54:40 +02:00
parent c4d2a38baa 77229e2b03
commit 6b0496bd33
17 changed files with 64 additions and 17 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,46 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<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>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/f631534d0aa40a1">f631534d0aa40a1</a> Jenkins Server <i>2017-07-28 15:58:08</i>
+<p>
+<h3>recommit for updates in build 12</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/08693a1e31472cf">08693a1e31472cf</a> Arne Teuke <i>2017-07-28 15:56:18</i>
+<p>
+<h3>syntax</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a8e9b704b1c9439">a8e9b704b1c9439</a> Arne Teuke <i>2017-07-28 15:54:28</i>
+<p>
+<h3>syntax</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/23ae33df2a31c0b">23ae33df2a31c0b</a> Arne Teuke <i>2017-07-28 15:52:39</i>
+<p>
+<h3>syntax</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/8b6098704e8fcde">8b6098704e8fcde</a> Arne Teuke <i>2017-07-28 15:49:54</i>
+<p>
+<h3>syntax</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/cd81ff2a9cb05ef">cd81ff2a9cb05ef</a> Arne Teuke <i>2017-07-28 15:49:02</i>
+<p>
+<h3>included firewall</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a6974bf41b23de4">a6974bf41b23de4</a> Arne Teuke <i>2017-07-28 15:42:50</i>
+<p>
+<h3>included service and pointed to files</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/bcfcbb00723a92c">bcfcbb00723a92c</a> Arne Teuke <i>2017-07-28 13:42:53</i>
 <p>
 <h3>fixed typo</h3>
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -9,18 +9,25 @@
 |   |   |-- full_list.js
 |   |   `-- jquery.js
 |   |-- puppet_classes
+|   |   |-- cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
 |   |   |-- cd_nrpe_3A_3Amain_3A_3Aconfig.html
+|   |   |-- cd_nrpe_3A_3Amain_3A_3Adirs.html
+|   |   |-- cd_nrpe_3A_3Amain_3A_3Afiles.html
 |   |   |-- cd_nrpe_3A_3Amain_3A_3Ainstall.html
+|   |   |-- cd_nrpe_3A_3Amain_3A_3Aservice.html
 |   |   |-- cd_nrpe_3A_3Amain_3A_3Auser.html
 |   |   |-- cd_nrpe_3A_3Amainn_3A_3Auser.html
 |   |   |-- cd_nrpe_3A_3Aparams.html
 |   |   |-- cd_nrpe_3A_3Auser.html
 |   |   `-- cd_nrpe.html
+|   |-- puppet_defined_types
+|   |   `-- cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
 |   |-- file.README.html
 |   |-- frames.html
 |   |-- _index.html
 |   |-- index.html
 |   |-- puppet_class_list.html
+|   |-- puppet_defined_type_list.html
 |   `-- top-level-namespace.html
 |-- manifests
 |   |-- commands
@@ -48,4 +55,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md

-10 directories, 38 files
+11 directories, 44 files
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -166,7 +166,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 17:58:04 2017 by
+  Generated on Fri Jul 28 18:04:55 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 17:58:05 2017 by
+  Generated on Fri Jul 28 18:04:56 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 17:58:05 2017 by
+  Generated on Fri Jul 28 18:04:56 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 17:58:05 2017 by
+  Generated on Fri Jul 28 18:04:56 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 17:58:06 2017 by
+  Generated on Fri Jul 28 18:04: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>
--- 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 17:58:06 2017 by
+  Generated on Fri Jul 28 18:04: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>
--- 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 17:58:06 2017 by
+  Generated on Fri Jul 28 18:04: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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
@@ -161,7 +161,7 @@ class cd_nrpe::main::files (

  file { $ne_main_conf_file:
    ensure    =&gt;  file,
-    path      =&gt;  ne_main_conf_file,
+    path      =&gt;  $ne_main_conf_file,
    owner     =&gt;  &#39;root&#39;,
    group     =&gt;  &#39;root&#39;,
    mode      =&gt;  &#39;0640&#39;,
@@ -181,7 +181,7 @@ class cd_nrpe::main::files (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 17:58:06 2017 by
+  Generated on Fri Jul 28 18:04: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>
--- 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 17:58:06 2017 by
+  Generated on Fri Jul 28 18:04: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>
--- 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 17:58:06 2017 by
+  Generated on Fri Jul 28 18:04: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>
--- 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 17:58:06 2017 by
+  Generated on Fri Jul 28 18:04: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>
--- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
@@ -960,7 +960,7 @@ $ne_nrpe_pid_file           = &quot;${ne_run_dir}/nrpe.pid&quot;
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 17:58:06 2017 by
+  Generated on Fri Jul 28 18:04: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>
--- 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 17:58:06 2017 by
+  Generated on Fri Jul 28 18:04: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>
--- 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 17:58:05 2017 by
+  Generated on Fri Jul 28 18:04:56 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
@@ -28,7 +28,7 @@ class cd_nrpe::main::files (

  file { $ne_main_conf_file:
    ensure    =>  file,
-    path      =>  ne_main_conf_file,
+    path      =>  $ne_main_conf_file,
    owner     =>  'root',
    group     =>  'root',
    mode      =>  '0640',