1 --- nagios-3.1.2/sample-config/cgi.cfg.in 2009-08-03 18:30:03.896753761 +0300
2 +++ svn/nagios-config/trunk/cgi.cfg 2009-08-03 18:25:38.142614386 +0300
4 #################################################################
6 -# CGI.CFG - Sample CGI Configuration File for Nagios @VERSION@
8 -# Last Modified: 06-17-2009
9 +# CGI.CFG - CGI Configuration File for Nagios
11 #################################################################
14 # This option determines whether or not a context-sensitive
15 # help icon will be displayed for most of the CGIs.
16 # Values: 0 = disables context-sensitive help
17 # 1 = enables context-sensitive help
25 # OS and distribution, so you may have to tweak this to
26 # work on your system.
28 -ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$
29 +ping_syntax=/usr/bin/ping -n -U -c 5 $HOSTADDRESS$
34 #splunk_url=http://127.0.0.1:8000/
38 +# vim:ts=8:sw=8:ft=cfg
39 --- nagios-3.1.2/sample-config/resource.cfg.in 2009-08-03 18:41:56.770015075 +0300
40 +++ svn/nagios-config/trunk/resource.cfg 2009-08-03 18:42:15.413396493 +0300
42 ###########################################################################
44 -# RESOURCE.CFG - Sample Resource File for Nagios @VERSION@
46 -# Last Modified: 09-10-2003
47 +# RESOURCE.CFG - Resource File for Nagios
49 # You can define $USERx$ macros in this file, which can in turn be used
50 # in command definitions in your host config file(s). $USERx$ macros are
51 --- nagios-3.1.2/sample-config/nagios.cfg.in 2009-08-05 00:05:06.623070929 +0300
52 +++ nagios-3.1.2/sample-config/nagios.cfg.in 2009-08-05 00:11:30.769380130 +0300
54 ##############################################################################
56 -# NAGIOS.CFG - Sample Main Config File for Nagios @VERSION@
57 +# NAGIOS.CFG - Main Config File for Nagios
59 # Read the documentation for more information on this configuration
60 # file. I've provided some comments here, but things may not be so
61 # clear without further explanation.
63 -# Last Modified: 12-14-2008
65 ##############################################################################
69 # for historical purposes. This should be the first option specified
70 # in the config file!!!
72 -log_file=@localstatedir@/nagios.log
73 +log_file=/var/log/nagios/nagios.log
78 # if you wish (as shown below), or keep them all in a single config file.
80 # You can specify individual object config files as shown below:
81 -cfg_file=@sysconfdir@/objects/commands.cfg
82 -cfg_file=@sysconfdir@/objects/contacts.cfg
83 -cfg_file=@sysconfdir@/objects/timeperiods.cfg
84 -cfg_file=@sysconfdir@/objects/templates.cfg
85 +cfg_file=@sysconfdir@/commands.cfg
86 +cfg_file=@sysconfdir@/contacts.cfg
87 +cfg_file=@sysconfdir@/timeperiods.cfg
88 +cfg_file=@sysconfdir@/templates.cfg
90 # Definitions for monitoring the local (Linux) host
91 -cfg_file=@sysconfdir@/objects/localhost.cfg
92 +#cfg_file=@sysconfdir@/objects/localhost.cfg
94 # Definitions for monitoring a Windows machine
95 #cfg_file=@sysconfdir@/objects/windows.cfg
97 # You can also tell Nagios to process all config files (with a .cfg
98 # extension) in a particular directory by using the cfg_dir
99 # directive as shown below:
101 -#cfg_dir=@sysconfdir@/servers
102 -#cfg_dir=@sysconfdir@/printers
103 -#cfg_dir=@sysconfdir@/switches
104 -#cfg_dir=@sysconfdir@/routers
107 +cfg_dir=@sysconfdir@/plugins
108 +cfg_dir=@sysconfdir@/objects
113 # This is the directory where archived (rotated) log files should be
114 # placed (assuming you've chosen to do log rotation).
116 -log_archive_path=@localstatedir@/archives
117 +log_archive_path=/var/log/nagios/archives
122 # If you want messages logged to the syslog facility, as well as the
123 # Nagios log file set this option to 1. If not, set it to 0.
131 # by Nagios Enterprises from the update check is processed in accordance
132 # with our privacy policy - see http://api.nagios.org for details.
140 # this data to determine the number of users running specific version of
141 # Nagios. Enable this option if you do not want this information to be sent.
149 # Performance data is only written to these files if the
150 # enable_performance_data option (above) is set to 1.
152 -#host_perfdata_file=/tmp/host-perfdata
153 -#service_perfdata_file=/tmp/service-perfdata
154 +#host_perfdata_file=@localstatedir@/host-perfdata
155 +#service_perfdata_file=@localstatedir@/service-perfdata
160 # pipe ("p") mode which avoid blocking at startup, otherwise you will
161 # likely want the defult append ("a") mode.
163 -#host_perfdata_file_mode=a
164 -#service_perfdata_file_mode=a
165 +host_perfdata_file_mode=a
166 +service_perfdata_file_mode=a
170 @@ -1065,7 +1058,7 @@
171 # strict-iso8601 (YYYY-MM-DDTHH:MM:SS)
179 @@ -1306,7 +1299,7 @@
181 # This option determines where Nagios should write debugging information.
183 -debug_file=@localstatedir@/nagios.debug
184 +debug_file=/var/log/nagios/nagios.debug