diff --git a/manifests/nagios/objects/add_timeperiod_rules.pp b/manifests/nagios/objects/add_timeperiod_rules.pp index b9f8e82..dff8d46 100644 --- a/manifests/nagios/objects/add_timeperiod_rules.pp +++ b/manifests/nagios/objects/add_timeperiod_rules.pp @@ -40,9 +40,9 @@ class cd_nagios::nagios::objects::add_timeperiod_rules ( # manage /etc/nagios/conf.d/nagios_timeperiods_add.cfg - concat { $ng_tgt_timeperiods_add: + concat { $ng_tgt_timep_add: ensure => present, - path => $ng_tgt_timeperiods_add, + path => $ng_tgt_timep_add, owner => $ng_user, group => $ng_user, mode => '0640', @@ -56,7 +56,7 @@ class cd_nagios::nagios::objects::add_timeperiod_rules ( # manage file header concat::fragment { 'timeperiods_header': - target => $ng_tgt_timeperiods_add, + target => $ng_tgt_timep_add, content => template($ng_tgt_timep_head_erb), order => '000', } diff --git a/manifests/nagios/objects/add_timeperiods.pp b/manifests/nagios/objects/add_timeperiods.pp index a95b750..622f725 100644 --- a/manifests/nagios/objects/add_timeperiods.pp +++ b/manifests/nagios/objects/add_timeperiods.pp @@ -58,7 +58,7 @@ $ng_timep_sunday = '00:00-00:00', ) { $ng_nagios_server = $::cd_nagios::params::ng_nagios_server -$ng_tgt_timeperiods_add = $::cd_nagios::params::ng_tgt_timeperiods_add +$ng_tgt_timep_add = $::cd_nagios::params::ng_tgt_timep_add $ng_tgt_timep_rule_erb = $::cd_nagios::params::ng_tgt_timep_rule_erb if $::fqdn == $ng_nagios_server { diff --git a/manifests/params.pp b/manifests/params.pp index 365a32e..deea859 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -964,7 +964,7 @@ $ng_target_templates = "${ng_conf_d_dir}/nagios_templates.cfg" $ng_templates_head_erb = 'cd_nagios/nagios/templates_cfg_head.erb' $ng_templates_rule_erb = 'cd_nagios/nagios/templates_cfg_rule.erb' $ng_tgt_timeperiods_base = "${ng_conf_d_dir}/nagios_timeperiods.cfg" -$ng_tgt_timeperiods_add = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg" +$ng_tgt_timep_add = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg" $ng_tgt_timep_head_erb = 'cd_nagios/nagios/timeperiods_cfg_head.erb' $ng_tgt_timep_rule_erb = 'cd_nagios/nagios/timeperiods_cfg_rule.erb' $ng_target_localhost = "${ng_conf_d_dir}/nagios_localhost.cfg"