summaryrefslogtreecommitdiff
path: root/files/configs/CentOS
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2009-12-02 17:39:46 -0500
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2009-12-02 17:39:46 -0500
commitfdaba117fb5b58adb73ba20046dada3cf9247161 (patch)
treeb864a737f7d1f2c3e705fe495826850b60a2055e /files/configs/CentOS
parent04cb2af5acc7811596aa0542ec08d39a17459907 (diff)
move puppet nagios resources down into conf.d
Diffstat (limited to 'files/configs/CentOS')
-rw-r--r--files/configs/CentOS/nagios.cfg45
1 files changed, 2 insertions, 43 deletions
diff --git a/files/configs/CentOS/nagios.cfg b/files/configs/CentOS/nagios.cfg
index f72a344..cddcbf3 100644
--- a/files/configs/CentOS/nagios.cfg
+++ b/files/configs/CentOS/nagios.cfg
@@ -30,49 +30,8 @@ log_file=/var/log/nagios/nagios.log
# This can be very useful if you want to keep command definitions
# separate from host and contact definitions...
-# all puppet native command paths
-cfg_file=/etc/nagios/nagios_command.cfg
-cfg_file=/etc/nagios/nagios_contact.cfg
-cfg_file=/etc/nagios/nagios_contactgroup.cfg
-cfg_file=/etc/nagios/nagios_host.cfg
-cfg_file=/etc/nagios/nagios_hostextinfo.cfg
-cfg_file=/etc/nagios/nagios_hostgroup.cfg
-cfg_file=/etc/nagios/nagios_hostgroupescalation.cfg
-cfg_file=/etc/nagios/nagios_service.cfg
-cfg_file=/etc/nagios/nagios_servicedependency.cfg
-cfg_file=/etc/nagios/nagios_serviceescalation.cfg
-cfg_file=/etc/nagios/nagios_serviceextinfo.cfg
-cfg_file=/etc/nagios/nagios_timeperdiod.cfg
-
-# Defaults for CentOS
-cfg_dir=/etc/nagios/defaults
-
-# You can split other types of object definitions across several
-# config files if you wish (as done here), or keep them all in a
-# single config file.
-
-#cfg_file=/etc/nagios/contactgroups.cfg
-#cfg_file=/etc/nagios/contacts.cfg
-#cfg_file=/etc/nagios/dependencies.cfg
-#cfg_file=/etc/nagios/escalations.cfg
-#cfg_file=/etc/nagios/hostgroups.cfg
-#cfg_file=/etc/nagios/hosts.cfg
-#cfg_file=/etc/nagios/services.cfg
-#cfg_file=/etc/nagios/timeperiods.cfg
-
-# Extended host/service info definitions are now stored along with
-# other object definitions:
-#cfg_file=/etc/nagios/hostextinfo.cfg
-#cfg_file=/etc/nagios/serviceextinfo.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
+# Puppet-managed configuration files
+cfg_dir=/etc/nagios3/conf.d