Merge branch 'jenkins' into 'master'

Jenkins See merge request !5
2017-07-20 18:05:56 +02:00
parent 3f8a4fb550 33ed2fc013
commit 6f84f9b4d0
22 changed files with 90 additions and 49 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,31 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/016ec1e6dbe77ac">016ec1e6dbe77ac</a> Jenkins Server <i>2017-07-20 15:17:24</i>
+<p>
+<h3>recommit for updates in build 8</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/508e672c317a2b8">508e672c317a2b8</a> Arne Teuke <i>2017-07-20 15:16:51</i>
+<p>
+<h3>added statuscgi_pol to template</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/8d204947db73672">8d204947db73672</a> Arne Teuke <i>2017-07-20 15:15:51</i>
+<p>
+<h3>added statuscgi_pol</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/aefb0a83a611a13">aefb0a83a611a13</a> Arne Teuke <i>2017-07-20 14:55:30</i>
+<p>
+<h3>undoing array</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/00267d122ba29c2">00267d122ba29c2</a> Arne Teuke <i>2017-07-20 14:54:56</i>
+<p>
+<h3>testing array</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/84a42a16a33cd80">84a42a16a33cd80</a> Jenkins Server <i>2017-07-20 14:46:15</i>
 <p>
 <h3>recommit for updates in build 4</h3>
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -51,7 +51,6 @@
 |-- templates
 |   |-- nagios
 |   |   |-- cgi_cfg.erb
-|   |   |-- htpasswd_head.erb
 |   |   `-- htpasswd_rule.erb
 |   `-- selinux
 |       |-- statuscgi.erb
@@ -66,4 +65,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md

-15 directories, 51 files
+15 directories, 50 files
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -176,7 +176,7 @@
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 17:17:19 2017 by
+  Generated on Thu Jul 20 18:14: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/file.README.html
+++ b/doc/file.README.html
@@ -297,7 +297,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Jul 20 17:17:20 2017 by
+  Generated on Thu Jul 20 18:14: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/index.html
+++ b/doc/index.html
@@ -297,7 +297,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Jul 20 17:17:20 2017 by
+  Generated on Thu Jul 20 18:14: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_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 17:17:20 2017 by
+  Generated on Thu Jul 20 18:14: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_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 17:17:22 2017 by
+  Generated on Thu Jul 20 18:14: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_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 17:17:22 2017 by
+  Generated on Thu Jul 20 18:14: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_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 17:17:21 2017 by
+  Generated on Thu Jul 20 18:14: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_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 17:17:22 2017 by
+  Generated on Thu Jul 20 18:14: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_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 17:17:22 2017 by
+  Generated on Thu Jul 20 18:14: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_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 17:17:21 2017 by
+  Generated on Thu Jul 20 18:14: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_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -171,7 +171,19 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 62
 63
 64
-65</pre>
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/selinux/config.pp', line 24</span>
@@ -182,11 +194,22 @@ class cd_nagios::selinux::config (

  if $ng_use_selinux_tools == true {

-    # sealert tac-cgi
+  # it appears that selinux hehaves differently accross different nodes,
+  # so all we can do for now is to create a list of the AVC alerts and come up
+  # with a solution on that later.
+
+    exec { &#39;create_avc_list&#39;:
+      command     =&gt;  &#39;sealert -a /var/log/audit/audit.log &gt; avc_alerts&#39;,
+      cwd         =&gt;  $ng_user_home,
+      path        =&gt;  [&#39;/usr/bin&#39;],
+      creates     =&gt;  &quot;${ng_user_home}/avc_alerts&quot;,
+    }
+
+   # sealert tac-cgi
    exec { &#39;create_policy_taccgi&#39;:
      command     =&gt;  template($ng_taccgi_erb),
      path        =&gt;  [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
-      cwd         =&gt;  &#39;/tmp&#39;,
+      cwd         =&gt;  $ng_user_home,
      creates     =&gt;  &#39;/tmp/my-taccgi.pp&#39;,
      notify      =&gt;  Exec[&#39;semodule_taccgi&#39;],
    }
@@ -194,7 +217,7 @@ class cd_nagios::selinux::config (
    exec { &#39;semodule_taccgi&#39;:
      command     =&gt;  &#39;semodule -i my-taccgi.pp&#39;,
      path        =&gt;  [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
-      cwd         =&gt;  &#39;/tmp&#39;,
+      cwd         =&gt;  $ng_user_home,
      require     =&gt;  Exec[&#39;create_policy_taccgi&#39;],
      refreshonly =&gt; true,
    }
@@ -204,7 +227,7 @@ class cd_nagios::selinux::config (
    exec { &#39;create_policy_statuscgi&#39;:
      command     =&gt;  template($ng_statcgi_erb),
      path        =&gt;  [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
-      cwd         =&gt;  &#39;/tmp&#39;,
+      cwd         =&gt;  $ng_user_home,
      creates     =&gt;  &#39;/tmp/my-statuscgi.pp&#39;,
      notify      =&gt;  Exec[&#39;semodule_taccgi&#39;],
    }
@@ -212,10 +235,11 @@ class cd_nagios::selinux::config (
    exec { &#39;semodule_statuscgi&#39;:
      command     =&gt;  &#39;semodule -i my-statuscgi.pp&#39;,
      path        =&gt;  [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
-      cwd         =&gt;  &#39;/tmp&#39;,
+      cwd         =&gt;  $ng_user_home,
      require     =&gt;  Exec[&#39;create_policy_statuscgi&#39;],
      refreshonly =&gt; true,
    }
+
  }
 }</pre>
      </td>
@@ -225,7 +249,7 @@ class cd_nagios::selinux::config (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 17:17:22 2017 by
+  Generated on Thu Jul 20 18:14: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_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -161,13 +161,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 46
 47
 48
-49
-50
-51
-52
-53
-54
-55</pre>
+49</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/server/access_rules.pp', line 28</span>
@@ -192,12 +186,6 @@ class cd_nagios::server::access_rules (
      seluser   =&gt;  system_u,
      notify    =&gt;  Service[$ng_service],
    }
-
-    concat::fragment { &#39;create_header&#39;:
-      target    =&gt;  $ng_htpasswd_file,
-      content   =&gt;  template($ng_htpasswd_head),
-      notify    =&gt;  Service[$ng_service],
-    }
  }
 }</pre>
      </td>
@@ -207,7 +195,7 @@ class cd_nagios::server::access_rules (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 17:17:22 2017 by
+  Generated on Thu Jul 20 18:14: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_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 17:17:22 2017 by
+  Generated on Thu Jul 20 18:14: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_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 17:17:22 2017 by
+  Generated on Thu Jul 20 18:14: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_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 17:17:22 2017 by
+  Generated on Thu Jul 20 18:14: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/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 17:17:20 2017 by
+  Generated on Thu Jul 20 18:14: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/manifests/selinux/config.pp
+++ b/manifests/selinux/config.pp
@@ -27,11 +27,22 @@ class cd_nagios::selinux::config (

  if $ng_use_selinux_tools == true {

-    # sealert tac-cgi
+  # it appears that selinux hehaves differently accross different nodes,
+  # so all we can do for now is to create a list of the AVC alerts and come up
+  # with a solution on that later.
+
+    exec { 'create_avc_list':
+      command     =>  'sealert -a /var/log/audit/audit.log > avc_alerts',
+      cwd         =>  $ng_user_home,
+      path        =>  ['/usr/bin'],
+      creates     =>  "${ng_user_home}/avc_alerts",
+    }
+
+   # sealert tac-cgi
    exec { 'create_policy_taccgi':
      command     =>  template($ng_taccgi_erb),
      path        =>  ['/usr/bin','/usr/sbin'],
-      cwd         =>  '/tmp',
+      cwd         =>  $ng_user_home,
      creates     =>  '/tmp/my-taccgi.pp',
      notify      =>  Exec['semodule_taccgi'],
    }
@@ -39,7 +50,7 @@ class cd_nagios::selinux::config (
    exec { 'semodule_taccgi':
      command     =>  'semodule -i my-taccgi.pp',
      path        =>  ['/usr/bin','/usr/sbin'],
-      cwd         =>  '/tmp',
+      cwd         =>  $ng_user_home,
      require     =>  Exec['create_policy_taccgi'],
      refreshonly => true,
    }
@@ -49,7 +60,7 @@ class cd_nagios::selinux::config (
    exec { 'create_policy_statuscgi':
      command     =>  template($ng_statcgi_erb),
      path        =>  ['/usr/bin','/usr/sbin'],
-      cwd         =>  '/tmp',
+      cwd         =>  $ng_user_home,
      creates     =>  '/tmp/my-statuscgi.pp',
      notify      =>  Exec['semodule_taccgi'],
    }
@@ -57,9 +68,10 @@ class cd_nagios::selinux::config (
    exec { 'semodule_statuscgi':
      command     =>  'semodule -i my-statuscgi.pp',
      path        =>  ['/usr/bin','/usr/sbin'],
-      cwd         =>  '/tmp',
+      cwd         =>  $ng_user_home,
      require     =>  Exec['create_policy_statuscgi'],
      refreshonly => true,
    }
+
  }
 }
--- a/manifests/server/access_rules.pp
+++ b/manifests/server/access_rules.pp
@@ -45,11 +45,5 @@ class cd_nagios::server::access_rules (
      seluser   =>  system_u,
      notify    =>  Service[$ng_service],
    }
-
-    concat::fragment { 'create_header':
-      target    =>  $ng_htpasswd_file,
-      content   =>  template($ng_htpasswd_head),
-      notify    =>  Service[$ng_service],
-    }
  }
 }
--- a/templates/nagios/htpasswd_head.erb
+++ b/templates/nagios/htpasswd_head.erb
--- a/tests/UTF_Files
+++ b/tests/UTF_Files
@@ -4,4 +4,3 @@
 ./.yardoc/objects/root.dat: data
 ./doc/css/style.css: HTML document, UTF-8 Unicode text, with very long lines
 ./doc/js/jquery.js: HTML document, UTF-8 Unicode text, with very long lines
-./templates/nagios/htpasswd_head.erb: empty