From eedfe76954f2c69785086ad22413a2492a131fb0 Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Tue, 23 Apr 2019 21:09:49 +0200 Subject: [PATCH] recommit for updates in build 12 --- CHANGELOG.md | 10 ++++++++++ REPOSTRUCTURE.md | 3 ++- .../cd_nrpe_3A_3Amain_3A_3Aexec.html | 18 +++++++++++++++++- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 4 +++- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d13068f..5a22c47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+522a99b01292b3c Jenkins ConfDroid 2019-04-23 18:55:18 +

+

recommit for updates in build 11

+ +

+d5fc2898407d984 Arne Teuke 2019-04-23 18:54:36 +

+

adds file content for nrpe.te

+ +

7ba65eb308d9609 Jenkins ConfDroid 2019-04-23 18:47:44

recommit for updates in build 10

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 946b6e8..94d1a13 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -58,6 +58,7 @@ | |-- nrpe_cfg.erb | |-- nrpe_conf.erb | |-- nrpe.te.erb +| |-- semodule_nrpe.erb | `-- sudo_rule.erb |-- tests | `-- UTF_Files @@ -68,4 +69,4 @@ |-- LICENSE `-- README.md -12 directories, 56 files +12 directories, 57 files diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aexec.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aexec.html index 9411a9d..c6971b6 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aexec.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aexec.html @@ -129,7 +129,15 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

30 31 32 -33 +33 +34 +35 +36 +37 +38 +39 +40 +41
# File 'manifests/main/exec.pp', line 23
@@ -144,6 +152,14 @@ class cd_nrpe::main::exec (
     user      =>  'root',
     creates   =>  $ne_nrpe_pp_file,
   }
+
+  # import semodule
+  exec { 'import_semodule_nrpe':
+    command   =>  template($ne_semodule_erb),
+    user      =>  'root',
+    require   =>  Exec['create_nrpe_pp'],
+    unless    =>  '/sbin/semodule -l | grep nrpe | grep -v nrpe_',
+  }
 }
diff --git a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html index 1208787..332f914 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -931,7 +931,8 @@ needed.

186 187 188 -189 +189 +190
# File 'manifests/params.pp', line 101
@@ -1019,6 +1020,7 @@ $ne_nrpe_te_erb             = 'cd_nrpe/nrpe.te.erb'
 $ne_nrpe_mod_file           = "${ne_main_conf_d_dir}/nrpe.mod"
 $ne_checkmodule_nrpe_erb    = 'cd_nrpe/checkmodule_nrpe.erb'
 $ne_nrpe_pp_file            = "${ne_main_conf_d_dir}/nrpe.pp"
+$ne_semodule_erb            =  'cd_nrpe/semodule_nrpe.erb'
 
 # includes must be last