--- nagios-2.0b3/sample-config/nagios.cfg.in.orig	2005-04-05 10:43:12 +1100

+++ nagios-2.0b3/sample-config/nagios.cfg.in	2005-04-05 10:49:41 +1100

@@ -16,7 +16,7 @@

 # for historical purposes.  This should be the first option specified 

 # in the config file!!!

-log_file=@localstatedir@/nagios.log

+log_file=/var/log/nagios/nagios.log

@@ -34,39 +34,39 @@

 # Arguments are likely to change between different releases of the

 # plugins, so you should use the same config file provided with the

 # plugin release rather than the one provided with Nagios.

-cfg_file=@sysconfdir@/checkcommands.cfg

+cfg_file=@sysconfdir@/nagios/checkcommands.cfg

 # Misc commands (notification and event handler commands, etc)

-cfg_file=@sysconfdir@/misccommands.cfg

+cfg_file=@sysconfdir@/nagios/misccommands.cfg

 # 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=@sysconfdir@/minimal.cfg

+cfg_file=@sysconfdir@/nagios/minimal.cfg

-#cfg_file=@sysconfdir@/contactgroups.cfg

-#cfg_file=@sysconfdir@/contacts.cfg

-#cfg_file=@sysconfdir@/dependencies.cfg

-#cfg_file=@sysconfdir@/escalations.cfg

-#cfg_file=@sysconfdir@/hostgroups.cfg

-#cfg_file=@sysconfdir@/hosts.cfg

-#cfg_file=@sysconfdir@/services.cfg

-#cfg_file=@sysconfdir@/timeperiods.cfg

+#cfg_file=@sysconfdir@/nagios/contactgroups.cfg

+#cfg_file=@sysconfdir@/nagios/contacts.cfg

+#cfg_file=@sysconfdir@/nagios/dependencies.cfg

+#cfg_file=@sysconfdir@/nagios/escalations.cfg

+#cfg_file=@sysconfdir@/nagios/hostgroups.cfg

+#cfg_file=@sysconfdir@/nagios/hosts.cfg

+#cfg_file=@sysconfdir@/nagios/services.cfg

+#cfg_file=@sysconfdir@/nagios/timeperiods.cfg

 # Extended host/service info definitions are now stored along with

 # other object definitions:

-#cfg_file=@sysconfdir@/hostextinfo.cfg

-#cfg_file=@sysconfdir@/serviceextinfo.cfg

+#cfg_file=@sysconfdir@/nagios/hostextinfo.cfg

+#cfg_file=@sysconfdir@/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=@sysconfdir@/servers

-#cfg_dir=@sysconfdir@/printers

-#cfg_dir=@sysconfdir@/switches

-#cfg_dir=@sysconfdir@/routers

+#cfg_dir=@sysconfdir@/nagios/servers

+#cfg_dir=@sysconfdir@/nagios/printers

+#cfg_dir=@sysconfdir@/nagios/switches

+#cfg_dir=@sysconfdir@/nagios/routers

@@ -77,7 +77,7 @@

 # directly) in order to prevent inconsistencies that can occur

 # when the config files are modified after Nagios starts.

-object_cache_file=@localstatedir@/objects.cache

+object_cache_file=@localstatedir@/nagios/objects.cache

@@ -90,7 +90,7 @@

 # defined as macros in this file and restrictive permissions (600)

 # can be placed on this file.

-resource_file=@sysconfdir@/resource.cfg

+resource_file=@sysconfdir@/nagios/resource.cfg

@@ -100,7 +100,7 @@

 # The contentsof the status file are deleted every time Nagios

 #  restarts.

-status_file=@localstatedir@/status.dat

+status_file=@localstatedir@/nagios/status.dat

@@ -128,7 +128,7 @@

 # you will have to enable this.  Setting this value to 0 disables command

 # checking (the default), other values enable it.

-check_external_commands=0

+check_external_commands=1

@@ -159,7 +159,7 @@

 # directory level instead of on the file, as the file is deleted every

 # time its contents are processed.

-command_file=@localstatedir@/rw/nagios.cmd

+command_file=@localstatedir@/nagios/rw/nagios.cmd

@@ -167,7 +167,7 @@

 # This is the file that Nagios will use for storing host and service

 # comments.

-comment_file=@localstatedir@/comments.dat

+comment_file=@localstatedir@/nagios/comments.dat

@@ -175,7 +175,7 @@

 # This is the file that Nagios will use for storing host and service

 # downtime data.

-downtime_file=@localstatedir@/downtime.dat

+downtime_file=@localstatedir@/nagios/downtime.dat

@@ -193,7 +193,7 @@

 # is created, used, and deleted throughout the time that Nagios is

 # running.

-temp_file=@localstatedir@/nagios.tmp

+temp_file=@localstatedir@/nagios/nagios.tmp

@@ -240,7 +240,7 @@

 # This is the directory where archived (rotated) log files should be 

 # placed (assuming you've chosen to do log rotation).

-log_archive_path=@localstatedir@/archives

+log_archive_path=/var/log/nagios/archives

@@ -248,7 +248,7 @@

 # If you want messages logged to the syslog facility, as well as the

 # NetAlarm log file set this option to 1.  If not, set it to 0.

-use_syslog=1

+use_syslog=0

@@ -506,7 +506,7 @@

 # This file is used only if the preserve_state_information

 # variable is set to 1.

-state_retention_file=@localstatedir@/retention.dat

+state_retention_file=@localstatedir@/nagios/retention.dat

@@ -540,7 +540,7 @@

 # If you want to use retained scheduling info, set this

 # value to 1.  If not, set this value to 0.

-use_retained_scheduling_info=0

+use_retained_scheduling_info=1

@@ -660,8 +660,8 @@

 # Performance data is only written to these files if the

 # enable_performance_data option (above) is set to 1.

-#host_perfdata_file=/tmp/host-perfdata

-#service_perfdata_file=/tmp/service-perfdata

+host_perfdata_file=/var/lib/nagios/tmp/host-perfdata

+service_perfdata_file=/var/lib/nagios/tmp/service-perfdata

@@ -746,7 +746,7 @@

 # rescheduled, you might want to try enabling this option.

 # Values: 1 = enable checks, 0 = disable checks

-check_for_orphaned_services=0

+check_for_orphaned_services=1

@@ -777,7 +777,7 @@

 # manner.

 # Values: 1 = enabled freshness checking, 0 = disable freshness checking

-check_host_freshness=0

+check_host_freshness=1

@@ -827,7 +827,7 @@

 # Values: 1 = enable flap detection

 #         0 = disable flap detection (default)

-enable_flap_detection=0

+enable_flap_detection=1

@@ -852,7 +852,7 @@

 #	strict-iso8601	(YYYY-MM-DDTHH:MM:SS)

 #

-date_format=us

+date_format=iso8601

@@ -900,7 +900,7 @@

 # group names/descriptions in some fields of various object types.

 # Values: 1 = enable regexp matching, 0 = disable regexp matching

-use_regexp_matching=0

+use_regexp_matching=1

@@ -914,7 +914,7 @@

 # all the time (which can be annoying).

 # Values: 1 = enable true matching, 0 = disable true matching

-use_true_regexp_matching=0

+use_true_regexp_matching=1