From 9a1901749977a7aaad076665d8fe9bfef2d8c540 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Sun, 29 Apr 2018 13:45:04 +0200 Subject: [PATCH] recommit for updates in build 13 --- CHANGELOG.md | 10 +++++ REPOSTRUCTURE.md | 3 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 12 +----- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 40 ++++++++++++++++++- 4 files changed, 53 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 337c3d6..6accafd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+6baa1f4db017449 Jenkins ConfDroid 2018-04-29 11:34:39 +

+

recommit for updates in build 12

+ +

+aaad9d3cb0c18e3 Arne Teuke 2018-04-29 11:34:32 +

+

updates mode

+ +

58693f537bd2a37 Jenkins ConfDroid 2018-04-29 11:23:03

recommit for updates in build 11

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 54385de..a13c486 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -129,6 +129,7 @@ | `-- selinux | |-- checknagios.erb | |-- checknrpe.erb +| |-- grep.erb | |-- statuscgi.erb | |-- statusdat.erb | `-- taccgi.erb @@ -142,4 +143,4 @@ |-- README.md `-- REPOSTRUCTURE.md -21 directories, 121 files +21 directories, 122 files diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 3439709..cd823c5 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -4929,8 +4929,6 @@ particular item.

(string) - (defaults to: '/usr/lib64/nagios/plugins') - —
@@ -4947,8 +4945,6 @@ particular item.

(string) - (defaults to: '/usr/lib64/nagios/plugins/eventhandlers') - —
@@ -5335,9 +5331,7 @@ particular item.

1013 1014 1015 -1016 -1017 -1018 +1016
# File 'manifests/params.pp', line 655
@@ -5596,9 +5590,6 @@ $ng_loadctl_options         = 'jobs_max=100;backoff_limit=10;rampup_change=5
 # single nagios checks
 $ng_enable_swap_check       = true,
 
-# resource.cfg
-$ng_user_arg1               = '/usr/lib64/nagios/plugins',
-$ng_user_arg2               = '/usr/lib64/nagios/plugins/eventhandlers',
 
 ) {
 
@@ -5660,6 +5651,7 @@ $ng_ssl_vhost_erb           = 'cd_nagios/httpd/nagios_ssl_vhost.erb'
 $ng_nagios_cfg_file         = "${ng_main_dir}/nagios.cfg"
 $ng_nagios_cfg_erb          = 'cd_nagios/nagios/nagios_cfg.erb'
 $ng_resource_erb            = 'cd_nagios/nagios/resource_cfg.erb'
+$ng_grep_erb                = 'cd_nagios/selinux/grep.erb'
 
 # certbot
 $ng_certbot_main_dir        = '/etc/letsencrypt'
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 e6df601..116834c 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -239,7 +239,26 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

130 131 132 -133
+133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152
# File 'manifests/selinux/config.pp', line 23
@@ -353,6 +372,25 @@ class cd_nagios::selinux::config (
       refreshonly =>  true,
       notify      =>  Service[$ng_service],
     }
+
+    # sealert grep
+
+    exec { 'create_policy_grep':
+      command     =>  template($ng_grep_erb),
+      path        =>  ['/usr/bin','/usr/sbin'],
+      cwd         =>  $ng_user_home,
+      creates     =>  "${ng_user_home}/my-grep.pp",
+      notify      =>  Exec['semodule_statusdat'],
+    }
+
+    exec { 'semodule_grep':
+      command     =>  "semodule -i ${ng_user_home}/my-grep.pp",
+      path        =>  ['/usr/bin','/usr/sbin'],
+      cwd         =>  $ng_user_home,
+      require     =>  Exec['create_policy_grep'],
+      refreshonly =>  true,
+      notify      =>  Service[$ng_service],
+    }
   }
 }