diff --git a/manifests/main/exec.pp b/manifests/main/exec.pp index 1d03c33..2088053 100644 --- a/manifests/main/exec.pp +++ b/manifests/main/exec.pp @@ -30,4 +30,12 @@ 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/manifests/params.pp b/manifests/params.pp index bae14b2..721b924 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -181,6 +181,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 diff --git a/templates/checkmodule_nrpe.erb b/templates/checkmodule_nrpe.erb index 8662cad..39ff411 100644 --- a/templates/checkmodule_nrpe.erb +++ b/templates/checkmodule_nrpe.erb @@ -1,3 +1,2 @@ /bin/checkmodule -M -m -o <%= @ne_nrpe_mod_file %> <%= @ne_nrpe_te_file %> /bin/semodule_package -o <%= @ne_nrpe_pp_file %> -m <%= @ne_nrpe_mod_file %> -/bin/semodule -i <%= @ne_nrpe_pp_file %> diff --git a/templates/semodule_nrpe.erb b/templates/semodule_nrpe.erb new file mode 100644 index 0000000..57551ae --- /dev/null +++ b/templates/semodule_nrpe.erb @@ -0,0 +1 @@ +/sbin/semodule -i <%= @ne_nrpe_pp_file %>