From c0182eec12e49c2a1729ad6304ace0cbb897bce6 Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Fri, 6 Mar 2026 12:04:36 +0100 Subject: [PATCH] OP#436 chanhe check for nagios --- manifests/server/service.pp | 2 +- templates/nagios/nagios_cfg.erb | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/manifests/server/service.pp b/manifests/server/service.pp index ef9ef9a..5a43979 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -44,7 +44,7 @@ class confdroid_nagios::server::service ( } @@nagios_service { 'check_nagios_localhost': - check_command => $ng_service_cmd, + check_command => 'check-nagios', use => 'generic-service', host_name => 'localhost', notification_period => '24x7', diff --git a/templates/nagios/nagios_cfg.erb b/templates/nagios/nagios_cfg.erb index 35e6395..1d1a31e 100644 --- a/templates/nagios/nagios_cfg.erb +++ b/templates/nagios/nagios_cfg.erb @@ -23,15 +23,6 @@ log_file=<%= @ng_log_file %> # Definitions for monitoring a network printer #cfg_file=/etc/nagios/objects/printer.cfg - -# You can also tell Nagios to process all config files (with a .cfg -# extension) in a particular directory by using the cfg_dir -# directive as shown below: - -#cfg_dir=/etc/nagios/servers -#cfg_dir=/etc/nagios/printers -#cfg_dir=/etc/nagios/switches -#cfg_dir=/etc/nagios/routers cfg_dir=<%= @ng_conf_d_dir %>