Merge branch 'jenkins' into 'master'

Jenkins See merge request !4
2017-07-20 17:08:28 +02:00
parent ae88116c3e 016ec1e6db
commit 3f8a4fb550
21 changed files with 90 additions and 21 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/84a42a16a33cd80">84a42a16a33cd80</a> Jenkins Server <i>2017-07-20 14:46:15</i>
+<p>
+<h3>recommit for updates in build 4</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/4c9cff0e73d216c">4c9cff0e73d216c</a> Arne Teuke <i>2017-07-20 14:45:54</i>
+<p>
+<h3>added check for nagios_server to access</h3>
+
+</p>
 <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>
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -54,6 +54,7 @@
 |   |   |-- htpasswd_head.erb
 |   |   `-- htpasswd_rule.erb
 |   `-- selinux
+|       |-- statuscgi.erb
 |       `-- taccgi.erb
 |-- tests
 |   `-- UTF_Files
@@ -65,4 +66,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md

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

      <div id="footer">
-  Generated on Thu Jul 20 16:46:09 2017 by
+  Generated on Thu Jul 20 17:17:19 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:46:11 2017 by
+  Generated on Thu Jul 20 17:17:20 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:46:10 2017 by
+  Generated on Thu Jul 20 17:17:20 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:46:11 2017 by
+  Generated on Thu Jul 20 17:17:20 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:46:13 2017 by
+  Generated on Thu Jul 20 17:17:22 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:46:12 2017 by
+  Generated on Thu Jul 20 17:17:22 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:46:12 2017 by
+  Generated on Thu Jul 20 17:17:21 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:46:12 2017 by
+  Generated on Thu Jul 20 17:17:22 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:46:12 2017 by
+  Generated on Thu Jul 20 17:17:22 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
@@ -1973,7 +1973,8 @@ enabled.</p>
 344
 345
 346
-347</pre>
+347
+348</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 198</span>
@@ -2122,6 +2123,7 @@ $ng_htpasswd_file = &quot;${ng_main_dir}/passwd&quot;
 $ng_htpasswd_head = &#39;cd_nagios/nagios/htpasswd_head.erb&#39;
 $ng_htpasswd_rule = &#39;cd_nagios/nagios/htpasswd_rule.erb&#39;
 $ng_taccgi_erb    = &#39;cd_nagios/selinux/taccgi.erb&#39;
+$ng_statcgi_erb   = &#39;cd_nagios/selinux/statuscgi.erb&#39;

 # includes must be last

@@ -2135,7 +2137,7 @@ $ng_taccgi_erb    = &#39;cd_nagios/selinux/taccgi.erb&#39;
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 16:46:12 2017 by
+  Generated on Thu Jul 20 17:17:21 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
@@ -153,7 +153,25 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 44
 45
 46
-47</pre>
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/selinux/config.pp', line 24</span>
@@ -164,7 +182,7 @@ class cd_nagios::selinux::config (

  if $ng_use_selinux_tools == true {

-    # sealert 093d6a07-03f5-4457-abaa-e6592fb01e05
+    # 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;],
@@ -180,6 +198,24 @@ class cd_nagios::selinux::config (
      require     =&gt;  Exec[&#39;create_policy_taccgi&#39;],
      refreshonly =&gt; true,
    }
+
+    # sealert status.cgi
+
+    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;,
+      creates     =&gt;  &#39;/tmp/my-statuscgi.pp&#39;,
+      notify      =&gt;  Exec[&#39;semodule_taccgi&#39;],
+    }
+
+    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;,
+      require     =&gt;  Exec[&#39;create_policy_statuscgi&#39;],
+      refreshonly =&gt; true,
+    }
  }
 }</pre>
      </td>
@@ -189,7 +225,7 @@ class cd_nagios::selinux::config (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 16:46:13 2017 by
+  Generated on Thu Jul 20 17:17:22 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:46:13 2017 by
+  Generated on Thu Jul 20 17:17:22 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:46:13 2017 by
+  Generated on Thu Jul 20 17:17:22 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:46:13 2017 by
+  Generated on Thu Jul 20 17:17:22 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 16:46:13 2017 by
+  Generated on Thu Jul 20 17:17:22 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:46:11 2017 by
+  Generated on Thu Jul 20 17:17:20 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/params.pp
+++ b/manifests/params.pp
@@ -339,6 +339,7 @@ $ng_htpasswd_file = "${ng_main_dir}/passwd"
 $ng_htpasswd_head = 'cd_nagios/nagios/htpasswd_head.erb'
 $ng_htpasswd_rule = 'cd_nagios/nagios/htpasswd_rule.erb'
 $ng_taccgi_erb    = 'cd_nagios/selinux/taccgi.erb'
+$ng_statcgi_erb   = 'cd_nagios/selinux/statuscgi.erb'

 # includes must be last

--- a/manifests/selinux/config.pp
+++ b/manifests/selinux/config.pp
@@ -27,7 +27,7 @@ class cd_nagios::selinux::config (

  if $ng_use_selinux_tools == true {

-    # sealert 093d6a07-03f5-4457-abaa-e6592fb01e05
+    # sealert tac-cgi
    exec { 'create_policy_taccgi':
      command     =>  template($ng_taccgi_erb),
      path        =>  ['/usr/bin','/usr/sbin'],
@@ -43,5 +43,23 @@ class cd_nagios::selinux::config (
      require     =>  Exec['create_policy_taccgi'],
      refreshonly => true,
    }
+
+    # sealert status.cgi
+
+    exec { 'create_policy_statuscgi':
+      command     =>  template($ng_statcgi_erb),
+      path        =>  ['/usr/bin','/usr/sbin'],
+      cwd         =>  '/tmp',
+      creates     =>  '/tmp/my-statuscgi.pp',
+      notify      =>  Exec['semodule_taccgi'],
+    }
+
+    exec { 'semodule_statuscgi':
+      command     =>  'semodule -i my-statuscgi.pp',
+      path        =>  ['/usr/bin','/usr/sbin'],
+      cwd         =>  '/tmp',
+      require     =>  Exec['create_policy_statuscgi'],
+      refreshonly => true,
+    }
  }
 }
--- a/templates/selinux/statuscgi.erb
+++ b/templates/selinux/statuscgi.erb
@@ -0,0 +1 @@
+ausearch -c 'status.cgi' --raw | audit2allow -M my-statuscgi
				`@@ -0,0 +1 @@`
				`ausearch -c 'status.cgi' --raw \| audit2allow -M my-statuscgi`