]>
Commit | Line | Data |
---|---|---|
e277f689 AM |
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 | |
4 | @@ -2,7 +2,7 @@ | |
5 | // | |
6 | ||
7 | ||
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 | |
10 | ||
11 | $cfg['cgi_base_url']='@cgiurl@'; | |
12 | ||
13 | diff -ur nagios.org/Makefile.in nagios/Makefile.in | |
14 | --- nagios.org/Makefile.in 2013-09-20 21:01:20.000000000 +0200 | |
15 | +++ nagios/Makefile.in 2013-10-01 21:51:45.176497587 +0200 | |
fa363e1f | 16 | @@ -234,14 +234,14 @@ install: |
e277f689 AM |
17 | cd $(SRC_BASE) && $(MAKE) $@ |
18 | cd $(SRC_CGI) && $(MAKE) $@ | |
19 | cd $(SRC_HTM) && $(MAKE) $@ | |
fa363e1f AM |
20 | - $(MAKE) install-exfoliation |
21 | + $(MAKE) install-classicui | |
22 | $(MAKE) install-basic | |
23 | ||
24 | install-unstripped: | |
25 | cd $(SRC_BASE) && $(MAKE) $@ | |
26 | cd $(SRC_CGI) && $(MAKE) $@ | |
27 | cd $(SRC_HTM) && $(MAKE) $@ | |
28 | - $(MAKE) install-exfoliation | |
e277f689 AM |
29 | + $(MAKE) install-classicui |
30 | $(MAKE) install-basic | |
31 | ||
32 | install-basic: | |
33 | diff -ur nagios.org/sample-config/cgi.cfg.in nagios/sample-config/cgi.cfg.in | |
34 | --- nagios.org/sample-config/cgi.cfg.in 2013-09-20 21:01:20.000000000 +0200 | |
35 | +++ nagios/sample-config/cgi.cfg.in 2013-10-01 21:52:32.937634398 +0200 | |
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 | ################################################################# | |
e277f689 | 44 | @@ -42,7 +42,7 @@ |
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 | ||
e277f689 | 53 | @@ -263,7 +263,7 @@ |
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 | ||
e277f689 | 62 | @@ -370,3 +370,5 @@ |
744a134f | 63 | |
e277f689 AM |
64 | navbar_search_for_addresses=1 |
65 | navbar_search_for_aliases=1 | |
66 | + | |
d304404b | 67 | +# vim:ts=8:sw=8:ft=cfg |
e277f689 AM |
68 | diff -ur nagios.org/sample-config/nagios.cfg.in nagios/sample-config/nagios.cfg.in |
69 | --- nagios.org/sample-config/nagios.cfg.in 2013-09-20 21:01:20.000000000 +0200 | |
70 | +++ nagios/sample-config/nagios.cfg.in 2013-10-01 21:53:09.708504449 +0200 | |
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 AM |
79 | @@ -15,7 +15,7 @@ |
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 | ||
e277f689 | 88 | @@ -26,13 +26,13 @@ |
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 | |
98 | +cfg_file=@sysconfdir@/timeperiods.cfg | |
99 | +cfg_file=@sysconfdir@/templates.cfg | |
100 | ||
101 | # Definitions for monitoring the local (Linux) host | |
102 | -cfg_file=@sysconfdir@/objects/localhost.cfg | |
103 | +#cfg_file=@sysconfdir@/objects/localhost.cfg | |
104 | ||
105 | # Definitions for monitoring a Windows machine | |
106 | #cfg_file=@sysconfdir@/objects/windows.cfg | |
e277f689 | 107 | @@ -47,13 +47,8 @@ |
8b8bd2f2 | 108 | # You can also tell Nagios to process all config files (with a .cfg |
4af19791 ER |
109 | # extension) in a particular directory by using the cfg_dir |
110 | # directive as shown below: | |
8b8bd2f2 ER |
111 | - |
112 | -#cfg_dir=@sysconfdir@/servers | |
113 | -#cfg_dir=@sysconfdir@/printers | |
114 | -#cfg_dir=@sysconfdir@/switches | |
115 | -#cfg_dir=@sysconfdir@/routers | |
116 | - | |
117 | - | |
118 | +cfg_dir=@sysconfdir@/plugins | |
119 | +cfg_dir=@sysconfdir@/objects | |
120 | ||
4af19791 | 121 | |
8b8bd2f2 | 122 | # OBJECT CACHE FILE |
e277f689 AM |
123 | @@ -242,7 +237,7 @@ |
124 | # This is the directory where archived (rotated) log files should be | |
4af19791 ER |
125 | # placed (assuming you've chosen to do log rotation). |
126 | ||
127 | -log_archive_path=@localstatedir@/archives | |
128 | +log_archive_path=/var/log/nagios/archives | |
129 | ||
130 | ||
131 | ||
e277f689 | 132 | @@ -250,7 +245,7 @@ |
1a03ba5e ER |
133 | # If you want messages logged to the syslog facility, as well as the |
134 | # Nagios log file set this option to 1. If not, set it to 0. | |
135 | ||
136 | -use_syslog=1 | |
137 | +use_syslog=0 | |
138 | ||
139 | ||
140 | ||
e277f689 AM |
141 | @@ -707,7 +702,7 @@ |
142 | # by Nagios Enterprises from the update check is processed in accordance | |
07166078 ER |
143 | # with our privacy policy - see http://api.nagios.org for details. |
144 | ||
145 | -check_for_updates=1 | |
146 | +check_for_updates=0 | |
147 | ||
148 | ||
149 | ||
e277f689 AM |
150 | @@ -719,7 +714,7 @@ |
151 | # this data to determine the number of users running specific version of | |
07166078 ER |
152 | # Nagios. Enable this option if you do not want this information to be sent. |
153 | ||
154 | -bare_update_check=0 | |
155 | +bare_update_check=1 | |
156 | ||
157 | ||
158 | ||
e277f689 | 159 | @@ -854,8 +849,8 @@ |
1a03ba5e ER |
160 | # pipe ("p") mode which avoid blocking at startup, otherwise you will |
161 | # likely want the defult append ("a") mode. | |
162 | ||
163 | -#host_perfdata_file_mode=a | |
164 | -#service_perfdata_file_mode=a | |
165 | +host_perfdata_file_mode=a | |
166 | +service_perfdata_file_mode=a | |
167 | ||
168 | ||
169 | ||
e277f689 | 170 | @@ -1091,7 +1086,7 @@ |
4af19791 ER |
171 | # strict-iso8601 (YYYY-MM-DDTHH:MM:SS) |
172 | # | |
173 | ||
174 | -date_format=us | |
175 | +date_format=iso8601 | |
176 | ||
177 | ||
178 | ||
e277f689 | 179 | @@ -1285,7 +1280,7 @@ |
4af19791 ER |
180 | # DEBUG FILE |
181 | # This option determines where Nagios should write debugging information. | |
182 | ||
183 | -debug_file=@localstatedir@/nagios.debug | |
184 | +debug_file=/var/log/nagios/nagios.debug | |
185 | ||
186 | ||
187 | ||
e277f689 AM |
188 | diff -ur nagios.org/sample-config/resource.cfg.in nagios/sample-config/resource.cfg.in |
189 | --- nagios.org/sample-config/resource.cfg.in 2013-09-20 21:01:20.000000000 +0200 | |
190 | +++ nagios/sample-config/resource.cfg.in 2013-10-01 21:52:53.371451113 +0200 | |
191 | @@ -1,6 +1,6 @@ | |
192 | ########################################################################### | |
193 | # | |
194 | -# RESOURCE.CFG - Sample Resource File for Nagios @VERSION@ | |
195 | +# RESOURCE.CFG - Sample Resource File for Nagios | |
196 | # | |
197 | # | |
198 | # You can define $USERx$ macros in this file, which can in turn be used |