From 00267d122ba29c2a11213ab69b5588aca42d661b Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 20 Jul 2017 15:54:56 +0100 Subject: [PATCH 1/5] testing array --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index f2c742f..325cd73 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -259,7 +259,7 @@ $ng_use_auth = '1', $ng_use_ssl_auth = '0', $ng_enable_def_user = false, $ng_def_user_name = 'nagios_insecure', -$ng_nagios_admin = 'nagios_sec_adm', +$ng_nagios_admin = ['nagios_sec_adm'], $ng_sysinfo_auth = '', $ng_confinfo_auth = '', $ng_command_auth = '', From aefb0a83a611a131d46a75c83c0fd32fd9ed0392 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 20 Jul 2017 15:55:30 +0100 Subject: [PATCH 2/5] undoing array --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 325cd73..f2c742f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -259,7 +259,7 @@ $ng_use_auth = '1', $ng_use_ssl_auth = '0', $ng_enable_def_user = false, $ng_def_user_name = 'nagios_insecure', -$ng_nagios_admin = ['nagios_sec_adm'], +$ng_nagios_admin = 'nagios_sec_adm', $ng_sysinfo_auth = '', $ng_confinfo_auth = '', $ng_command_auth = '', From 8d204947db73672b6312e357ea7cff30f115ada8 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 20 Jul 2017 16:15:51 +0100 Subject: [PATCH 3/5] added statuscgi_pol --- manifests/params.pp | 1 + manifests/selinux/config.pp | 20 +++++++++++++++++++- templates/selinux/statuscgi.erb | 0 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 templates/selinux/statuscgi.erb diff --git a/manifests/params.pp b/manifests/params.pp index f2c742f..79bf349 100644 --- 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 diff --git a/manifests/selinux/config.pp b/manifests/selinux/config.pp index b2516a3..39336b1 100644 --- 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, + } } } diff --git a/templates/selinux/statuscgi.erb b/templates/selinux/statuscgi.erb new file mode 100644 index 0000000..e69de29 From 508e672c317a2b8f7e87d08ee7b336fa6900fbe9 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 20 Jul 2017 16:16:51 +0100 Subject: [PATCH 4/5] added statuscgi_pol to template --- templates/selinux/statuscgi.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/selinux/statuscgi.erb b/templates/selinux/statuscgi.erb index e69de29..aad984f 100644 --- a/templates/selinux/statuscgi.erb +++ b/templates/selinux/statuscgi.erb @@ -0,0 +1 @@ +ausearch -c 'status.cgi' --raw | audit2allow -M my-statuscgi From 016ec1e6dbe77ac8ad967a4d41e6f2a195562821 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 20 Jul 2017 17:17:24 +0200 Subject: [PATCH 5/5] recommit for updates in build 8 --- CHANGELOG.md | 10 +++++ REPOSTRUCTURE.md | 3 +- doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 6 ++- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 42 +++++++++++++++++-- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 18 files changed, 69 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7f351f..cd3a9a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+84a42a16a33cd80 Jenkins Server 2017-07-20 14:46:15 +

+

recommit for updates in build 4

+ +

+4c9cff0e73d216c Arne Teuke 2017-07-20 14:45:54 +

+

added check for nagios_server to access

+ +

030e5f68f509f71 Jenkins Server 2017-07-20 14:11:13

recommit for updates in build 3

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 89b1b11..a608adb 100644 --- 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 diff --git a/doc/_index.html b/doc/_index.html index 29129a0..ff3df04 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -176,7 +176,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 28527bf..ae7462f 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 609f6cf..a5c3e26 100644 --- a/doc/index.html +++ b/doc/index.html @@ -297,7 +297,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index fee5196..af68945 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 36840d8..c3a3efd 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 421fbc2..016771f 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 050d1a4..df389e2 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 65d0fd9..d1ce1b6 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index da0ddf3..272c0e7 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 2a7d453..5782712 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -1973,7 +1973,8 @@ enabled.

344 345 346 -347 +347 +348 
# File 'manifests/params.pp', line 198
@@ -2122,6 +2123,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
 
@@ -2135,7 +2137,7 @@ $ng_taccgi_erb    = 'cd_nagios/selinux/taccgi.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index 3686949..a49032e 100644
--- 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/.

 44
 45
 46
-47
+47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 
# File 'manifests/selinux/config.pp', line 24
@@ -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 { 'create_policy_taccgi':
       command     =>  template($ng_taccgi_erb),
       path        =>  ['/usr/bin','/usr/sbin'],
@@ -180,6 +198,24 @@ 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,
+    }
   }
 }
@@ -189,7 +225,7 @@ class cd_nagios::selinux::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html index a21999a..df68ae4 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html index 0add6cd..58d11ef 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html index 30ef896..543dae7 100644 --- 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 ( diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index 2997627..d95895c 100644 --- 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 diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index c9dd615..257cc45 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@