]>
Commit | Line | Data |
---|---|---|
2a5edde2 AM |
1 | diff -urNp -x '*.orig' nagios-4.4.6.org/Makefile.in nagios-4.4.6/Makefile.in |
2 | --- nagios-4.4.6.org/Makefile.in 2020-04-28 22:48:29.000000000 +0200 | |
3 | +++ nagios-4.4.6/Makefile.in 2021-04-19 12:03:30.865816616 +0200 | |
4 | @@ -276,14 +276,14 @@ install: | |
e277f689 AM |
5 | cd $(SRC_BASE) && $(MAKE) $@ |
6 | cd $(SRC_CGI) && $(MAKE) $@ | |
7 | cd $(SRC_HTM) && $(MAKE) $@ | |
fa363e1f AM |
8 | - $(MAKE) install-exfoliation |
9 | + $(MAKE) install-classicui | |
10 | $(MAKE) install-basic | |
11 | ||
12 | install-unstripped: | |
13 | cd $(SRC_BASE) && $(MAKE) $@ | |
14 | cd $(SRC_CGI) && $(MAKE) $@ | |
15 | cd $(SRC_HTM) && $(MAKE) $@ | |
16 | - $(MAKE) install-exfoliation | |
e277f689 AM |
17 | + $(MAKE) install-classicui |
18 | $(MAKE) install-basic | |
19 | ||
20 | install-basic: | |
2a5edde2 AM |
21 | diff -urNp -x '*.orig' nagios-4.4.6.org/html/config.inc.php.in nagios-4.4.6/html/config.inc.php.in |
22 | --- nagios-4.4.6.org/html/config.inc.php.in 2020-04-28 22:48:29.000000000 +0200 | |
23 | +++ nagios-4.4.6/html/config.inc.php.in 2021-04-19 12:03:30.865816616 +0200 | |
24 | @@ -2,7 +2,7 @@ | |
25 | // | |
26 | ||
27 | ||
28 | -$cfg['cgi_config_file']='@sysconfdir@/cgi.cfg'; // location of the CGI config file | |
29 | +$cfg['cgi_config_file']='/etc/webapps/nagios/cgi.cfg'; // location of the CGI config file | |
30 | ||
31 | $cfg['cgi_base_url']='@cgiurl@'; | |
32 | ||
33 | diff -urNp -x '*.orig' nagios-4.4.6.org/sample-config/cgi.cfg.in nagios-4.4.6/sample-config/cgi.cfg.in | |
34 | --- nagios-4.4.6.org/sample-config/cgi.cfg.in 2020-04-28 22:48:29.000000000 +0200 | |
35 | +++ nagios-4.4.6/sample-config/cgi.cfg.in 2021-04-19 12:03:30.865816616 +0200 | |
e277f689 | 36 | @@ -1,6 +1,6 @@ |
744a134f ER |
37 | ################################################################# |
38 | # | |
39 | -# CGI.CFG - Sample CGI Configuration File for Nagios @VERSION@ | |
e277f689 AM |
40 | +# CGI.CFG - Sample CGI Configuration File for Nagios |
41 | # | |
744a134f ER |
42 | # |
43 | ################################################################# | |
2a5edde2 | 44 | @@ -42,7 +42,7 @@ url_html_path=@htmurl@ |
744a134f ER |
45 | # Values: 0 = disables context-sensitive help |
46 | # 1 = enables context-sensitive help | |
47 | ||
48 | -show_context_help=0 | |
49 | +show_context_help=1 | |
50 | ||
51 | ||
52 | ||
2a5edde2 | 53 | @@ -270,7 +270,7 @@ default_statuswrl_layout=4 |
744a134f ER |
54 | # OS and distribution, so you may have to tweak this to |
55 | # work on your system. | |
56 | ||
57 | -ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$ | |
58 | +ping_syntax=/usr/bin/ping -n -U -c 5 $HOSTADDRESS$ | |
59 | ||
60 | ||
61 | ||
667f6304 AM |
62 | @@ -420,3 +420,5 @@ navbar_search_for_aliases=1 |
63 | #CMT_ACKNOWLEDGE_HOST_PROBLEM=2,"Problem is being looked into" | |
64 | #CMT_SCHEDULE_SVC_CHECK=1 | |
65 | #CMT_SCHEDULE_HOST_DOWNTIME=0 | |
e277f689 | 66 | + |
d304404b | 67 | +# vim:ts=8:sw=8:ft=cfg |
2a5edde2 AM |
68 | diff -urNp -x '*.orig' nagios-4.4.6.org/sample-config/nagios.cfg.in nagios-4.4.6/sample-config/nagios.cfg.in |
69 | --- nagios-4.4.6.org/sample-config/nagios.cfg.in 2020-04-28 22:48:29.000000000 +0200 | |
70 | +++ nagios-4.4.6/sample-config/nagios.cfg.in 2021-04-19 12:03:30.865816616 +0200 | |
e277f689 | 71 | @@ -1,6 +1,6 @@ |
4af19791 ER |
72 | ############################################################################## |
73 | # | |
74 | -# NAGIOS.CFG - Sample Main Config File for Nagios @VERSION@ | |
e277f689 | 75 | +# NAGIOS.CFG - Sample Main Config File for Nagios |
4af19791 ER |
76 | # |
77 | # Read the documentation for more information on this configuration | |
78 | # file. I've provided some comments here, but things may not be so | |
e277f689 | 79 | @@ -15,7 +15,7 @@ |
2a5edde2 | 80 | # for historical purposes. This should be the first option specified |
4af19791 ER |
81 | # in the config file!!! |
82 | ||
83 | -log_file=@localstatedir@/nagios.log | |
84 | +log_file=/var/log/nagios/nagios.log | |
85 | ||
86 | ||
87 | ||
2a5edde2 | 88 | @@ -26,13 +26,14 @@ log_file=@localstatedir@/nagios.log |
8b8bd2f2 ER |
89 | # if you wish (as shown below), or keep them all in a single config file. |
90 | ||
91 | # You can specify individual object config files as shown below: | |
92 | -cfg_file=@sysconfdir@/objects/commands.cfg | |
93 | -cfg_file=@sysconfdir@/objects/contacts.cfg | |
94 | -cfg_file=@sysconfdir@/objects/timeperiods.cfg | |
95 | -cfg_file=@sysconfdir@/objects/templates.cfg | |
96 | +cfg_file=@sysconfdir@/commands.cfg | |
97 | +cfg_file=@sysconfdir@/contacts.cfg | |
1aeb05de | 98 | +cfg_file=@sysconfdir@/contactgroups.cfg |
8b8bd2f2 ER |
99 | +cfg_file=@sysconfdir@/timeperiods.cfg |
100 | +cfg_file=@sysconfdir@/templates.cfg | |
101 | ||
102 | # Definitions for monitoring the local (Linux) host | |
103 | -cfg_file=@sysconfdir@/objects/localhost.cfg | |
104 | +#cfg_file=@sysconfdir@/objects/localhost.cfg | |
105 | ||
106 | # Definitions for monitoring a Windows machine | |
107 | #cfg_file=@sysconfdir@/objects/windows.cfg | |
2a5edde2 | 108 | @@ -47,13 +48,8 @@ cfg_file=@sysconfdir@/objects/localhost. |
8b8bd2f2 | 109 | # You can also tell Nagios to process all config files (with a .cfg |
4af19791 ER |
110 | # extension) in a particular directory by using the cfg_dir |
111 | # directive as shown below: | |
8b8bd2f2 ER |
112 | - |
113 | -#cfg_dir=@sysconfdir@/servers | |
114 | -#cfg_dir=@sysconfdir@/printers | |
115 | -#cfg_dir=@sysconfdir@/switches | |
116 | -#cfg_dir=@sysconfdir@/routers | |
117 | - | |
118 | - | |
119 | +cfg_dir=@sysconfdir@/plugins | |
120 | +cfg_dir=@sysconfdir@/objects | |
121 | ||
4af19791 | 122 | |
8b8bd2f2 | 123 | # OBJECT CACHE FILE |
2a5edde2 AM |
124 | @@ -243,7 +239,7 @@ log_rotation_method=d |
125 | # This is the directory where archived (rotated) log files should be | |
4af19791 ER |
126 | # placed (assuming you've chosen to do log rotation). |
127 | ||
128 | -log_archive_path=@localstatedir@/archives | |
129 | +log_archive_path=/var/log/nagios/archives | |
130 | ||
131 | ||
132 | ||
2a5edde2 | 133 | @@ -251,7 +247,7 @@ log_archive_path=@localstatedir@/archive |
1a03ba5e ER |
134 | # If you want messages logged to the syslog facility, as well as the |
135 | # Nagios log file set this option to 1. If not, set it to 0. | |
136 | ||
137 | -use_syslog=1 | |
138 | +use_syslog=0 | |
139 | ||
140 | ||
141 | ||
2a5edde2 AM |
142 | @@ -709,7 +705,7 @@ interval_length=60 |
143 | # by Nagios Enterprises from the update check is processed in accordance | |
144 | # with our privacy policy - see https://api.nagios.org for details. | |
07166078 ER |
145 | |
146 | -check_for_updates=1 | |
147 | +check_for_updates=0 | |
148 | ||
149 | ||
150 | ||
2a5edde2 AM |
151 | @@ -721,7 +717,7 @@ check_for_updates=1 |
152 | # this data to determine the number of users running specific version of | |
07166078 ER |
153 | # Nagios. Enable this option if you do not want this information to be sent. |
154 | ||
155 | -bare_update_check=0 | |
156 | +bare_update_check=1 | |
157 | ||
158 | ||
159 | ||
2a5edde2 | 160 | @@ -856,8 +852,8 @@ process_performance_data=0 |
1a03ba5e | 161 | # pipe ("p") mode which avoid blocking at startup, otherwise you will |
2a5edde2 | 162 | # likely want the default append ("a") mode. |
1a03ba5e ER |
163 | |
164 | -#host_perfdata_file_mode=a | |
165 | -#service_perfdata_file_mode=a | |
166 | +host_perfdata_file_mode=a | |
167 | +service_perfdata_file_mode=a | |
168 | ||
169 | ||
170 | ||
2a5edde2 | 171 | @@ -1093,7 +1089,7 @@ high_host_flap_threshold=20.0 |
4af19791 ER |
172 | # strict-iso8601 (YYYY-MM-DDTHH:MM:SS) |
173 | # | |
174 | ||
175 | -date_format=us | |
176 | +date_format=iso8601 | |
177 | ||
178 | ||
179 | ||
2a5edde2 | 180 | @@ -1292,7 +1288,7 @@ debug_verbosity=1 |
4af19791 ER |
181 | # DEBUG FILE |
182 | # This option determines where Nagios should write debugging information. | |
183 | ||
184 | -debug_file=@localstatedir@/nagios.debug | |
185 | +debug_file=/var/log/nagios/nagios.debug | |
186 | ||
187 | ||
188 | ||
2a5edde2 AM |
189 | diff -urNp -x '*.orig' nagios-4.4.6.org/sample-config/resource.cfg.in nagios-4.4.6/sample-config/resource.cfg.in |
190 | --- nagios-4.4.6.org/sample-config/resource.cfg.in 2021-04-19 12:03:30.622476046 +0200 | |
191 | +++ nagios-4.4.6/sample-config/resource.cfg.in 2021-04-19 12:03:30.865816616 +0200 | |
e277f689 AM |
192 | @@ -1,6 +1,6 @@ |
193 | ########################################################################### | |
194 | # | |
195 | -# RESOURCE.CFG - Sample Resource File for Nagios @VERSION@ | |
196 | +# RESOURCE.CFG - Sample Resource File for Nagios | |
197 | # | |
198 | # | |
199 | # You can define $USERx$ macros in this file, which can in turn be used |