Merge branch 'jenkins' into 'master'

Jenkins See merge request !3
2017-07-20 16:38:54 +02:00
parent 4f7ca0ad36 84a42a16a3
commit ae88116c3e
18 changed files with 55 additions and 25 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/030e5f68f509f71">030e5f68f509f71</a> Jenkins Server <i>2017-07-20 14:11:13</i>
+<p>
+<h3>recommit for updates in build 3</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/8a14684ca214be5">8a14684ca214be5</a> Arne Teuke <i>2017-07-20 14:10:54</i>
+<p>
+<h3>changed creates rule for exec</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/cb2010e7d20dcc6">cb2010e7d20dcc6</a> Arne Teuke <i>2017-07-20 14:09:11</i>
+<p>
+<h3>moved service dependency to access_rules</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/3a3e3ceef9a4a2f">3a3e3ceef9a4a2f</a> Jenkins Server <i>2017-07-20 13:47:46</i>
 <p>
 <h3>recommit for updates in build 2</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -176,7 +176,7 @@
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 16:11:07 2017 by
+  Generated on Thu Jul 20 16:46:09 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
@@ -297,7 +297,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Jul 20 16:11:08 2017 by
+  Generated on Thu Jul 20 16:46:11 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
@@ -297,7 +297,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Jul 20 16:11:08 2017 by
+  Generated on Thu Jul 20 16:46:10 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 Thu Jul 20 16:11:09 2017 by
+  Generated on Thu Jul 20 16:46:11 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 Thu Jul 20 16:11:10 2017 by
+  Generated on Thu Jul 20 16:46:13 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
@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 16:11:10 2017 by
+  Generated on Thu Jul 20 16:46:12 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 Thu Jul 20 16:11:10 2017 by
+  Generated on Thu Jul 20 16:46:12 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 Thu Jul 20 16:11:10 2017 by
+  Generated on Thu Jul 20 16:46:12 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 Thu Jul 20 16:11:10 2017 by
+  Generated on Thu Jul 20 16:46:12 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
@@ -2135,7 +2135,7 @@ $ng_taccgi_erb    = &#39;cd_nagios/selinux/taccgi.erb&#39;
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 16:11:10 2017 by
+  Generated on Thu Jul 20 16:46:12 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
@@ -189,7 +189,7 @@ class cd_nagios::selinux::config (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 16:11:10 2017 by
+  Generated on Thu Jul 20 16:46:13 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
@@ -207,7 +207,7 @@ class cd_nagios::server::access_rules (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 16:11:11 2017 by
+  Generated on Thu Jul 20 16:46:13 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
@@ -196,7 +196,7 @@ class cd_nagios::server::files (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 16:11:10 2017 by
+  Generated on Thu Jul 20 16:46:13 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
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 16:11:10 2017 by
+  Generated on Thu Jul 20 16:46:13 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
@@ -169,7 +169,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 37
 38
 39
-40</pre>
+40
+41
+42
+43
+44
+45</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/server/access.pp', line 23</span>
@@ -181,15 +186,20 @@ $ng_htpasswd_password = undef,

 ) {

+$ng_nagios_server = $::cd_nagios::params::ng_nagios_server
 $ng_htpasswd_file = $::cd_nagios::params::ng_htpasswd_file
 $ng_htpasswd_rule = $::cd_nagios::params::ng_htpasswd_rule
 $ng_service       = $::cd_nagios::params::ng_service

-  # create password rules

-  concat::fragment { $name:
-    target  =&gt;  $ng_htpasswd_file,
-    content =&gt;  template($ng_htpasswd_rule),
+  if $::fqdn == $ng_nagios_server {
+
+    # create password rules
+
+    concat::fragment { $name:
+      target  =&gt;  $ng_htpasswd_file,
+      content =&gt;  template($ng_htpasswd_rule),
+    }
  }
 }</pre>
      </td>
@@ -199,7 +209,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 16:11:11 2017 by
+  Generated on Thu Jul 20 16:46:13 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 Thu Jul 20 16:11:08 2017 by
+  Generated on Thu Jul 20 16:46:11 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/server/access.pp
+++ b/manifests/server/access.pp
@@ -27,14 +27,19 @@ $ng_htpasswd_password = undef,

 ) {

+$ng_nagios_server = $::cd_nagios::params::ng_nagios_server
 $ng_htpasswd_file = $::cd_nagios::params::ng_htpasswd_file
 $ng_htpasswd_rule = $::cd_nagios::params::ng_htpasswd_rule
 $ng_service       = $::cd_nagios::params::ng_service

-  # create password rules

-  concat::fragment { $name:
-    target  =>  $ng_htpasswd_file,
-    content =>  template($ng_htpasswd_rule),
+  if $::fqdn == $ng_nagios_server {
+
+    # create password rules
+
+    concat::fragment { $name:
+      target  =>  $ng_htpasswd_file,
+      content =>  template($ng_htpasswd_rule),
+    }
  }
 }