Merge branch 'jenkins' into 'master'

Jenkins See merge request !52
2017-07-26 14:16:21 +02:00
parent 1eb3b2d734 039523e1f6
commit 070dc41e42
30 changed files with 52 additions and 38 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/d395b5f60d08f61">d395b5f60d08f61</a> Jenkins Server <i>2017-07-26 11:16:49</i>
+<p>
+<h3>recommit for updates in build 97</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/85ade68820b8379">85ade68820b8379</a> Arne Teuke <i>2017-07-26 11:16:25</i>
+<p>
+<h3>added base contacts and additional contacts</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/62feddee64c23f9">62feddee64c23f9</a> Jenkins Server <i>2017-07-25 18:04:08</i>
 <p>
 <h3>recommit for updates in build 96</h3>
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -17,7 +17,10 @@
 |   |   |-- cd_nagios_3A_3Amain_3A_3Adirs.html
 |   |   |-- cd_nagios_3A_3Amain_3A_3Ainstall.html
 |   |   |-- cd_nagios_3A_3Amain_3A_3Auser.html
+|   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
+|   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
+|   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
 |   |   |-- cd_nagios_3A_3Aparams.html
 |   |   |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -26,6 +29,7 @@
 |   |   |-- cd_nagios_3A_3Aserver_3A_3Aservice.html
 |   |   `-- cd_nagios.html
 |   |-- puppet_defined_types
+|   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
 |   |   `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html
 |   |-- file.README.html
@@ -96,4 +100,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md

-20 directories, 76 files
+20 directories, 80 files
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -221,7 +221,7 @@
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:39 2017 by
+  Generated on Wed Jul 26 13:30: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/file.README.html
+++ b/doc/file.README.html
@@ -352,7 +352,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:40 2017 by
+  Generated on Wed Jul 26 13:30:46 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
@@ -352,7 +352,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:39 2017 by
+  Generated on Wed Jul 26 13:30: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_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:40 2017 by
+  Generated on Wed Jul 26 13:30:46 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_nagios_3A_3Acertbot_3A_3Acerts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:45 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:45 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:45 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:44 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:44 2017 by
+  Generated on Wed Jul 26 13:30:49 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_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:44 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:44 2017 by
+  Generated on Wed Jul 26 13:30:49 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_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
@@ -205,7 +205,7 @@ class cd_nagios::nagios::objects::add_contact_rules (

    # manage file header

-    concat::fragment { &#39;header&#39;:
+    concat::fragment { &#39;contact_header&#39;:
      target    =&gt;  $ng_target_add_contact,
      content   =&gt;  template($ng_contacts_head_erb),
      order     =&gt;  &#39;000&#39;,
@@ -228,7 +228,7 @@ class cd_nagios::nagios::objects::add_contact_rules (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:46 2017 by
+  Generated on Wed Jul 26 13:30:51 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_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html
@@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:45 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
@@ -164,7 +164,7 @@ class cd_nagios::nagios::objects::config (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:45 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
@@ -255,7 +255,7 @@ class cd_nagios::nagios::objects::contacts (
      mode                =&gt;  &#39;0640&#39;,
    }

-   # support contact
+    # support contact

    @@nagios_contact { &#39;support&#39;:
      ensure              =&gt;  present,
@@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:45 2017 by
+  Generated on Wed Jul 26 13:30:51 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_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
@@ -243,10 +243,10 @@ class cd_nagios::nagios::objects::template_rules (
      notify    =&gt;  Service[$ng_service],
    }

-  concat::fragment { &#39;header&#39;:
-    target    =&gt;  $ng_target_templates,
-    content   =&gt;  template($ng_templates_head_erb),
-    order     =&gt;  &#39;000&#39;,
+    concat::fragment { &#39;template_header&#39;:
+      target    =&gt;  $ng_target_templates,
+      content   =&gt;  template($ng_templates_head_erb),
+      order     =&gt;  &#39;000&#39;,
    }


@@ -303,7 +303,7 @@ class cd_nagios::nagios::objects::template_rules (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:46 2017 by
+  Generated on Wed Jul 26 13:30:51 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_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -5569,7 +5569,7 @@ $ng_target_command        = &quot;${ng_conf_d_dir}/nagios_command.cfg&quot;
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:44 2017 by
+  Generated on Wed Jul 26 13:30:49 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_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:45 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:45 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:45 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -268,7 +268,7 @@ class cd_nagios::server::service (
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:45 2017 by
+  Generated on Wed Jul 26 13:30:50 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_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
@@ -225,7 +225,7 @@ $ng_contact_groups  = undef,
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:46 2017 by
+  Generated on Wed Jul 26 13:30:51 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_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
@@ -935,7 +935,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:46 2017 by
+  Generated on Wed Jul 26 13:30:51 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_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>

      <div id="footer">
-  Generated on Wed Jul 26 13:16:46 2017 by
+  Generated on Wed Jul 26 13:30:51 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 Wed Jul 26 13:16:40 2017 by
+  Generated on Wed Jul 26 13:30:46 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/nagios/objects/add_contact_rules.pp
+++ b/manifests/nagios/objects/add_contact_rules.pp
@@ -51,7 +51,7 @@ class cd_nagios::nagios::objects::add_contact_rules (

    # manage file header

-    concat::fragment { 'header':
+    concat::fragment { 'contact_header':
      target    =>  $ng_target_add_contact,
      content   =>  template($ng_contacts_head_erb),
      order     =>  '000',
--- a/manifests/nagios/objects/contacts.pp
+++ b/manifests/nagios/objects/contacts.pp
@@ -77,7 +77,7 @@ class cd_nagios::nagios::objects::contacts (
      mode                =>  '0640',
    }

-   # support contact
+    # support contact

    @@nagios_contact { 'support':
      ensure              =>  present,
--- a/manifests/nagios/objects/template_rules.pp
+++ b/manifests/nagios/objects/template_rules.pp
@@ -46,10 +46,10 @@ class cd_nagios::nagios::objects::template_rules (
      notify    =>  Service[$ng_service],
    }

-  concat::fragment { 'header':
-    target    =>  $ng_target_templates,
-    content   =>  template($ng_templates_head_erb),
-    order     =>  '000',
+    concat::fragment { 'template_header':
+      target    =>  $ng_target_templates,
+      content   =>  template($ng_templates_head_erb),
+      order     =>  '000',
    }