From 6f6abc12cb4bc76d8828c43da38517b26b67553e Mon Sep 17 00:00:00 2001 From: Jenkins ConfDroid Date: Tue, 23 Apr 2019 21:22:32 +0200 Subject: [PATCH] recommit for updates in build 14 --- CHANGELOG.md | 10 ++++++++++ .../cd_nrpe_3A_3Amain_3A_3Aexec.html | 20 +++++++++++-------- .../cd_nrpe_3A_3Amain_3A_3Afiles.html | 4 +++- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a8fa4b..e9f76b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

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

+

recommit for updates in build 13

+ +

+580770e28443657 Arne Teuke 2019-04-23 19:15:30 +

+

adds eec to import policy

+ +

eedfe76954f2c69 Jenkins ConfDroid 2019-04-23 19:09:49

recommit for updates in build 12

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 ad0c6e6..9599686 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aexec.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aexec.html @@ -139,7 +139,9 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

40 41 42 -43 +43 +44 +45
# File 'manifests/main/exec.pp', line 23
@@ -152,17 +154,19 @@ class cd_nrpe::main::exec (
 
   # create policy file fpr sudo selinux policy
   exec { 'create_nrpe_pp':
-    command   =>  template($ne_checkmodule_nrpe_erb),
-    user      =>  'root',
-    creates   =>  $ne_nrpe_pp_file,
+    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',
-    require   =>  Exec['create_nrpe_pp'],
-    unless    =>  '/sbin/semodule -l | grep nrpe | grep -v nrpe_',
+    command     =>  template($ne_semodule_erb),
+    user        =>  'root',
+    unless      =>  '/sbin/semodule -l | grep nrpe | grep -v nrpe_',
+    refreshonly =>  true,
   }
 }
diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html index 9a11d26..4d09cb8 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -186,7 +186,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

87 88 89 -90 +90 +91
# File 'manifests/main/files.pp', line 23
@@ -256,6 +257,7 @@ class cd_nrpe::main::files (
       seltype   =>  nrpe_etc_t,
       seluser   =>  system_u,
       content   =>  template($ne_nrpe_te_erb),
+      notify    =>  Exec['create_nrpe_pp'],
     }
   }
 }