1 diff -ur nagios.org/html/config.inc.php.in nagios/html/config.inc.php.in
2 --- nagios.org/html/config.inc.php.in 2013-09-20 21:01:20.000000000 +0200
3 +++ nagios/html/config.inc.php.in 2013-10-01 21:51:45.176497587 +0200
8 -$cfg['cgi_config_file']='@sysconfdir@/cgi.cfg'; // location of the CGI config file
9 +$cfg['cgi_config_file']='/etc/webapps/nagios/cgi.cfg'; // location of the CGI config file
11 $cfg['cgi_base_url']='@cgiurl@';
13 --- nagios.org/Makefile.in 2013-09-20 21:01:20.000000000 +0200
14 +++ nagios/Makefile.in 2013-10-01 21:51:45.176497587 +0200
15 @@ -234,14 +234,14 @@ install:
16 cd $(SRC_BASE) && $(MAKE) $@
17 cd $(SRC_CGI) && $(MAKE) $@
18 cd $(SRC_HTM) && $(MAKE) $@
19 - $(MAKE) install-exfoliation
20 + $(MAKE) install-classicui
24 cd $(SRC_BASE) && $(MAKE) $@
25 cd $(SRC_CGI) && $(MAKE) $@
26 cd $(SRC_HTM) && $(MAKE) $@
27 - $(MAKE) install-exfoliation
28 + $(MAKE) install-classicui
32 --- nagios-4.2.1/sample-config/cgi.cfg.in~ 2016-09-07 19:22:34.000000000 +0300
33 +++ nagios-4.2.1/sample-config/cgi.cfg.in 2016-09-07 19:22:52.152175332 +0300
35 #################################################################
37 -# CGI.CFG - Sample CGI Configuration File for Nagios @VERSION@
38 +# CGI.CFG - Sample CGI Configuration File for Nagios
41 #################################################################
43 # Values: 0 = disables context-sensitive help
44 # 1 = enables context-sensitive help
52 # OS and distribution, so you may have to tweak this to
53 # work on your system.
55 -ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$
56 +ping_syntax=/usr/bin/ping -n -U -c 5 $HOSTADDRESS$
60 @@ -394,3 +394,5 @@ navbar_search_for_aliases=1
61 # Set to 1 to show only HARD states. Defaults to 0 (HARD+SOFT).
65 +# vim:ts=8:sw=8:ft=cfg
66 --- nagios.org/sample-config/nagios.cfg.in 2013-09-20 21:01:20.000000000 +0200
67 +++ nagios/sample-config/nagios.cfg.in 2013-10-01 21:53:09.708504449 +0200
69 ##############################################################################
71 -# NAGIOS.CFG - Sample Main Config File for Nagios @VERSION@
72 +# NAGIOS.CFG - Sample Main Config File for Nagios
74 # Read the documentation for more information on this configuration
75 # file. I've provided some comments here, but things may not be so
77 # for historical purposes. This should be the first option specified
78 # in the config file!!!
80 -log_file=@localstatedir@/nagios.log
81 +log_file=/var/log/nagios/nagios.log
86 # if you wish (as shown below), or keep them all in a single config file.
88 # You can specify individual object config files as shown below:
89 -cfg_file=@sysconfdir@/objects/commands.cfg
90 -cfg_file=@sysconfdir@/objects/contacts.cfg
91 -cfg_file=@sysconfdir@/objects/timeperiods.cfg
92 -cfg_file=@sysconfdir@/objects/templates.cfg
93 +cfg_file=@sysconfdir@/commands.cfg
94 +cfg_file=@sysconfdir@/contacts.cfg
95 +cfg_file=@sysconfdir@/contactgroups.cfg
96 +cfg_file=@sysconfdir@/timeperiods.cfg
97 +cfg_file=@sysconfdir@/templates.cfg
99 # Definitions for monitoring the local (Linux) host
100 -cfg_file=@sysconfdir@/objects/localhost.cfg
101 +#cfg_file=@sysconfdir@/objects/localhost.cfg
103 # Definitions for monitoring a Windows machine
104 #cfg_file=@sysconfdir@/objects/windows.cfg
106 # You can also tell Nagios to process all config files (with a .cfg
107 # extension) in a particular directory by using the cfg_dir
108 # directive as shown below:
110 -#cfg_dir=@sysconfdir@/servers
111 -#cfg_dir=@sysconfdir@/printers
112 -#cfg_dir=@sysconfdir@/switches
113 -#cfg_dir=@sysconfdir@/routers
116 +cfg_dir=@sysconfdir@/plugins
117 +cfg_dir=@sysconfdir@/objects
122 # This is the directory where archived (rotated) log files should be
123 # placed (assuming you've chosen to do log rotation).
125 -log_archive_path=@localstatedir@/archives
126 +log_archive_path=/var/log/nagios/archives
131 # If you want messages logged to the syslog facility, as well as the
132 # Nagios log file set this option to 1. If not, set it to 0.
140 # by Nagios Enterprises from the update check is processed in accordance
141 # with our privacy policy - see http://api.nagios.org for details.
149 # this data to determine the number of users running specific version of
150 # Nagios. Enable this option if you do not want this information to be sent.
158 # pipe ("p") mode which avoid blocking at startup, otherwise you will
159 # likely want the defult append ("a") mode.
161 -#host_perfdata_file_mode=a
162 -#service_perfdata_file_mode=a
163 +host_perfdata_file_mode=a
164 +service_perfdata_file_mode=a
168 @@ -1091,7 +1087,7 @@
169 # strict-iso8601 (YYYY-MM-DDTHH:MM:SS)
177 @@ -1285,7 +1281,7 @@
179 # This option determines where Nagios should write debugging information.
181 -debug_file=@localstatedir@/nagios.debug
182 +debug_file=/var/log/nagios/nagios.debug
186 --- nagios.org/sample-config/resource.cfg.in 2013-09-20 21:01:20.000000000 +0200
187 +++ nagios/sample-config/resource.cfg.in 2013-10-01 21:52:53.371451113 +0200
189 ###########################################################################
191 -# RESOURCE.CFG - Sample Resource File for Nagios @VERSION@
192 +# RESOURCE.CFG - Sample Resource File for Nagios
195 # You can define $USERx$ macros in this file, which can in turn be used