Merge branch 'jenkins' into 'master'

Jenkins See merge request !50
2017-07-25 19:54:21 +02:00
parent 95cf5c84bd 62feddee64
commit 91df6d463c
23 changed files with 88 additions and 24 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/a23722a67a2afb6">a23722a67a2afb6</a> Jenkins Server <i>2017-07-25 17:56:39</i>
+<p>
+<h3>recommit for updates in build 93</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a04f079a6cbeec8">a04f079a6cbeec8</a> Arne Teuke <i>2017-07-25 17:56:18</i>
+<p>
+<h3>testing templates</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/445db500b3ab876">445db500b3ab876</a> Jenkins Server <i>2017-07-25 16:15:39</i>
 <p>
 <h3>recommit for updates in build 92</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -201,7 +201,7 @@
 </div>

      <div id="footer">
-  Generated on Tue Jul 25 19:56:29 2017 by
+  Generated on Tue Jul 25 20:03: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/file.README.html
+++ b/doc/file.README.html
@@ -338,7 +338,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Tue Jul 25 19:56:31 2017 by
+  Generated on Tue Jul 25 20:03:59 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
@@ -338,7 +338,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Tue Jul 25 19:56:30 2017 by
+  Generated on Tue Jul 25 20:03: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/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 Tue Jul 25 19:56:31 2017 by
+  Generated on Tue Jul 25 20:03:59 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 Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:03 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 Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:04 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 Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:04 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 Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:03 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 Tue Jul 25 19:56:34 2017 by
+  Generated on Tue Jul 25 20:04:03 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 Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:03 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 Tue Jul 25 19:56:34 2017 by
+  Generated on Tue Jul 25 20:04:03 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 Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:04 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
@@ -198,7 +198,25 @@ ng_template_object_name =&gt;  &#39;generic-contact&#39;,
 79
 80
 81
-82</pre>
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/template_rules.pp', line 27</span>
@@ -221,10 +239,16 @@ class cd_nagios::nagios::objects::template_rules (
      selrole   =&gt;  object_r,
      seltype   =&gt;  nagios_etc_t,
      seluser   =&gt;  system_u,
-      content   =&gt;  template[$ng_templates_head_erb],
      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;,
+    }
+
+
    # basic templates
    cd_nagios::nagios::objects::templates { &#39;generic contact&#39;:
      ng_template_object      =&gt; &#39;contact&#39;,
@@ -246,6 +270,18 @@ class cd_nagios::nagios::objects::template_rules (
      ng_template_object_use  =&gt;  &#39;generic-host&#39;,
      ng_notification_options =&gt;  &#39;d,u,r&#39;,
    }
+    cd_nagios::nagios::objects::templates { &#39;generic-switch&#39;:
+      ng_template_object      =&gt;  &#39;host&#39;,
+      ng_template_object_name =&gt;  &#39;generic-switch&#39;,
+      ng_template_object_use  =&gt;  &#39;generic-host&#39;,
+      ng_notification_options =&gt;  &#39;d,u,r&#39;,
+    }
+    cd_nagios::nagios::objects::templates { &#39;generic-printer&#39;:
+      ng_template_object      =&gt;  &#39;host&#39;,
+      ng_template_object_name =&gt;  &#39;generic-printer&#39;,
+      ng_template_object_use  =&gt;  &#39;generic-host&#39;,
+      ng_notification_options =&gt;  &#39;d,u,r&#39;,
+    }
    cd_nagios::nagios::objects::templates { &#39;generic-service&#39;:
      ng_template_object      =&gt;  &#39;service&#39;,
      ng_template_object_name =&gt;  &#39;generic-service&#39;,
@@ -266,7 +302,7 @@ class cd_nagios::nagios::objects::template_rules (
 </div>

      <div id="footer">
-  Generated on Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:04 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
@@ -5557,7 +5557,7 @@ $ng_target_command        = &quot;${ng_conf_d_dir}/nagios_command.cfg&quot;
 </div>

      <div id="footer">
-  Generated on Tue Jul 25 19:56:34 2017 by
+  Generated on Tue Jul 25 20:04:03 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 Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:04 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 Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:04 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 Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:03 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
@@ -270,7 +270,7 @@ class cd_nagios::server::service (
 </div>

      <div id="footer">
-  Generated on Tue Jul 25 19:56:35 2017 by
+  Generated on Tue Jul 25 20:04:04 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
@@ -936,7 +936,7 @@ $ng_templates_rule_erb  = $::cd_nagios::params::ng_templates_rule_erb
 </div>

      <div id="footer">
-  Generated on Tue Jul 25 19:56:36 2017 by
+  Generated on Tue Jul 25 20:04:05 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 Tue Jul 25 19:56:36 2017 by
+  Generated on Tue Jul 25 20:04:04 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 Tue Jul 25 19:56:31 2017 by
+  Generated on Tue Jul 25 20:03:59 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/template_rules.pp
+++ b/manifests/nagios/objects/template_rules.pp
@@ -42,10 +42,16 @@ class cd_nagios::nagios::objects::template_rules (
      selrole   =>  object_r,
      seltype   =>  nagios_etc_t,
      seluser   =>  system_u,
-      content   =>  template[$ng_templates_head_erb],
      notify    =>  Service[$ng_service],
    }

+  concat::fragment { 'header':
+    target    =>  $ng_target_templates,
+    content   =>  template($ng_templates_head_erb),
+    order     =>  '000',
+    }
+
+
    # basic templates
    cd_nagios::nagios::objects::templates { 'generic contact':
      ng_template_object      => 'contact',
@@ -67,6 +73,18 @@ class cd_nagios::nagios::objects::template_rules (
      ng_template_object_use  =>  'generic-host',
      ng_notification_options =>  'd,u,r',
    }
+    cd_nagios::nagios::objects::templates { 'generic-switch':
+      ng_template_object      =>  'host',
+      ng_template_object_name =>  'generic-switch',
+      ng_template_object_use  =>  'generic-host',
+      ng_notification_options =>  'd,u,r',
+    }
+    cd_nagios::nagios::objects::templates { 'generic-printer':
+      ng_template_object      =>  'host',
+      ng_template_object_name =>  'generic-printer',
+      ng_template_object_use  =>  'generic-host',
+      ng_notification_options =>  'd,u,r',
+    }
    cd_nagios::nagios::objects::templates { 'generic-service':
      ng_template_object      =>  'service',
      ng_template_object_name =>  'generic-service',