From 73a596d8f0b7d22be3a78010a8b287013770f614 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Tue, 23 Apr 2019 21:29:53 +0200 Subject: [PATCH] recommit for updates in build 15 --- CHANGELOG.md | 10 ++++++ REPOSTRUCTURE.md | 3 +- doc/_index.html | 5 --- doc/puppet_class_list.html | 19 ++++------ .../cd_nrpe_3A_3Amain_3A_3Aservice.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 2 -- .../cd_nrpe_3A_3Aselinux_3A_3Aconfig.html | 36 ++++++++++++++++++- 7 files changed, 53 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9f76b4..e5506e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+6f6abc12cb4bc76 Jenkins ConfDroid 2019-04-23 19:22:32 +

+

recommit for updates in build 14

+ +

+22585b6da993134 Arne Teuke 2019-04-23 19:21:54 +

+

adds eec to import policy

+ +

a2c194d812cad4d Jenkins ConfDroid 2019-04-23 19:16:13

recommit for updates in build 13

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 94d1a13..329aaae 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -42,7 +42,6 @@ | |-- main | | |-- config.pp | | |-- dirs.pp -| | |-- exec.pp | | |-- files.pp | | |-- install.pp | | |-- service.pp @@ -69,4 +68,4 @@ |-- LICENSE `-- README.md -12 directories, 57 files +12 directories, 56 files diff --git a/doc/_index.html b/doc/_index.html index a20317e..5161d6c 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -93,11 +93,6 @@ -
  • - cd_nrpe::main::exec - -
    • -
  • cd_nrpe::main::files diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index a7c8bfe..fdfed85 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -75,49 +75,42 @@
    • -
  • -
    - cd_nrpe::main::exec -
    -
    • - - -
  • +
  • cd_nrpe::main::files
    • -
  • +
  • cd_nrpe::main::install
    • -
  • +
  • cd_nrpe::main::service
    • -
  • +
  • cd_nrpe::main::user
    • -
  • +
  • cd_nrpe::params
    • -
  • +
  • cd_nrpe::selinux::config
    diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html index 67be662..ae35b94 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html @@ -157,7 +157,7 @@ class cd_nrpe::main::service ( require cd_nrpe::firewall::iptables } - require cd_nrpe::main::exec + require cd_nrpe::main::files if $ne_manage_cmds == true { require cd_nrpe::commands::definition_rules diff --git a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html index 332f914..143fd55 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -69,8 +69,6 @@ cd_nrpe::main::dirs
    - cd_nrpe::main::exec
    - cd_nrpe::main::user
    cd_nrpe::main::files
    diff --git a/doc/puppet_classes/cd_nrpe_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nrpe_3A_3Aselinux_3A_3Aconfig.html index 2422cf9..b16a541 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aselinux_3A_3Aconfig.html @@ -134,7 +134,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    34 35 36 -37 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 
    # File 'manifests/selinux/config.pp', line 22
@@ -153,6 +170,23 @@ class cd_nrpe::selinux::config (
       cwd     =>  '/tmp',
       unless  =>  'getsebool nagios_run_sudo | awk \'{print$3}\' | grep -ic "on"'
     }
+
+    # create policy file for sudo selinux policy
+    exec { 'create_nrpe_pp':
+      command     =>  template($ne_checkmodule_nrpe_erb),
+      user        =>  'root',
+      creates     =>  $ne_nrpe_pp_file,
+      refreshonly =>  true,
+      notify      =>  Exec['import_semodule_nrpe'],
+    }
+
+    # import semodule
+    exec { 'import_semodule_nrpe':
+      command     =>  template($ne_semodule_erb),
+      user        =>  'root',
+      unless      =>  '/sbin/semodule -l | grep nrpe | grep -v nrpe_',
+      refreshonly =>  true,
+    }
   }
 }