Merge branch 'jenkins' into 'master'

Jenkins See merge request !7
2017-07-20 18:17:49 +02:00
parent ae0a409e6b 05036af241
commit 18f00a47f9
18 changed files with 28 additions and 18 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/2d7dc8a5c57ed98">2d7dc8a5c57ed98</a> Jenkins Server <i>2017-07-20 16:21:27</i>
 <p>
 <h3>recommit for updates in build 11</h3>
 </p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/3252eaf33a90183">3252eaf33a90183</a> Arne Teuke <i>2017-07-20 16:21:09</i>
 <p>
 <h3>trying to work my way again through selinux</h3>
 </p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/33ed2fc013f9abd">33ed2fc013f9abd</a> Jenkins Server <i>2017-07-20 16:15:02</i>
 <p>
 <h3>recommit for updates in build 10</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -176,7 +176,7 @@
 </div>
      <div id="footer">
-  Generated on Thu Jul 20 18:21:22 2017 by
+  Generated on Thu Jul 20 18:26:35 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 18:21:23 2017 by
+  Generated on Thu Jul 20 18:26:36 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 18:21:22 2017 by
+  Generated on Thu Jul 20 18:26:35 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 18:21:23 2017 by
+  Generated on Thu Jul 20 18:26:36 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 18:21:25 2017 by
+  Generated on Thu Jul 20 18:26:38 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 18:21:25 2017 by
+  Generated on Thu Jul 20 18:26:37 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 18:21:24 2017 by
+  Generated on Thu Jul 20 18:26:37 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 18:21:25 2017 by
+  Generated on Thu Jul 20 18:26:38 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 18:21:24 2017 by
+  Generated on Thu Jul 20 18:26:37 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
@@ -2137,7 +2137,7 @@ $ng_statcgi_erb   = &#39;cd_nagios/selinux/statuscgi.erb&#39;
 </div>
      <div id="footer">
-  Generated on Thu Jul 20 18:21:24 2017 by
+  Generated on Thu Jul 20 18:26:37 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
@@ -228,7 +228,7 @@ class cd_nagios::selinux::config (
      path        =&gt;  [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
      cwd         =&gt;  $ng_user_home,
      creates     =&gt;  &quot;${ng_user_home}/my-statuscgi.pp&quot;,
-      notify      =&gt;  Exec[&#39;semodule_taccgi&#39;],
+      notify      =&gt;  Exec[&#39;semodule_statuscgi&#39;],
    }
    exec { &#39;semodule_statuscgi&#39;:
@@ -247,7 +247,7 @@ class cd_nagios::selinux::config (
 </div>
      <div id="footer">
-  Generated on Thu Jul 20 18:21:25 2017 by
+  Generated on Thu Jul 20 18:26:38 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 Thu Jul 20 18:21:25 2017 by
+  Generated on Thu Jul 20 18:26:38 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 18:21:25 2017 by
+  Generated on Thu Jul 20 18:26:38 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 18:21:25 2017 by
+  Generated on Thu Jul 20 18:26:38 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
@@ -209,7 +209,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>
      <div id="footer">
-  Generated on Thu Jul 20 18:21:25 2017 by
+  Generated on Thu Jul 20 18:26:38 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 18:21:23 2017 by
+  Generated on Thu Jul 20 18:26:36 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/selinux/config.pp
+++ b/manifests/selinux/config.pp
@@ -62,7 +62,7 @@ class cd_nagios::selinux::config (
      path        =>  ['/usr/bin','/usr/sbin'],
      cwd         =>  $ng_user_home,
      creates     =>  "${ng_user_home}/my-statuscgi.pp",
-      notify      =>  Exec['semodule_taccgi'],
+      notify      =>  Exec['semodule_statuscgi'],
    }
    exec { 'semodule_statuscgi':