5c44be6bad
Changes since 3.2.3:
ENHANCEMENTS
* Added support for same host service dependencies with servicegroups (Mathieu Gagné)
* Empty hostgroups referenced from services now optionally generate a warning instead of an error.
* Documentation links now point to online resources
* Matt Wall's Exfoliation theme is now installed by default. You can reinstall the classic theme with "make install-classicui"
* Downtime delete commands made "distributable" by deleting by host group name, host name or start time/comment (Opsview team)
* Allow status.cgi to order by "host urgency" (Jochen Bern)
* Added news items and quick links to main splash page
* Added ability to authenticate to CGIs using contactgroup name (Stephen Gran)
FIXES
* Fixes status.cgi when called with no parameters, where host should be set to all if none specified (Michael Friedrich)
* Fixes possible validation error with empty hostgroups/servicegroups (Sven-Göran Bergh)
* Performance-data handling and checking is now thread-safe so long as embedded perl is not used.
* Children should no longer hang on mutex locks held in parent for localtime() (and similar) calls.
* Debug logging is now properly serialized, using soft-locking with a timeout of 150 milliseconds to avoid multiple threads competing for the privilege to write debug info.
* Fixed extraneous alerts for services when host is down
* Fixed incorrect parsing of multi-line host check results (Jochen Bern)
* Fixed bug with passive host checks being incorrectly sent to event brokers as active checks
* Fixed bug where passive host check status updates were not being propagated to event brokers
* Reverted 'Fix for retaining host display name and alias, as well as service display name' as configuration information stored incorrectly over a reload
* Fixed compile warnings for size_t (Michael Friedrich)
* Fixed problem where acknowledgements were getting reset when a hard state change occurred
* Removed duplicated unlinks for check result files with multiple results
* Fixed race condition on flexible downtime commands when duration not set or zero (Michael Friedrich)
* Fixed flexible downtime on service hard state change doesn't get triggered/activated (Michael Friedrich)
* Fixed XSS vulnerability in config.cgi and statusmap.cgi (Stefan Schurtz)
* Fixed segfault when sending host notifications (Michael Friedrich)
* Fixed bug where unauthorized contacts could issue hostgroup and servicegroup commands (Sven Nierlein)
182 lines
8 KiB
Text
182 lines
8 KiB
Text
$NetBSD: patch-aa,v 1.9 2011/08/02 14:03:18 bouyer Exp $
|
|
|
|
--- Makefile.in.orig 2011-07-26 04:02:18.000000000 +0200
|
|
+++ Makefile.in 2011-08-01 20:14:30.000000000 +0200
|
|
@@ -24,17 +24,16 @@
|
|
exec_prefix=@exec_prefix@
|
|
LOGDIR=@localstatedir@
|
|
CHECKRESULTDIR=@CHECKRESULTDIR@
|
|
-CFGDIR=@sysconfdir@
|
|
+SAMPDIR=@prefix@/share/examples/nagios
|
|
BINDIR=@bindir@
|
|
-CGIDIR=@sbindir@
|
|
+CGIDIR=@libexecdir@
|
|
LIBEXECDIR=@libexecdir@
|
|
HTMLDIR=@datadir@
|
|
INSTALL=@INSTALL@
|
|
INSTALL_OPTS=@INSTALL_OPTS@
|
|
COMMAND_OPTS=@COMMAND_OPTS@
|
|
-HTTPD_CONF=@HTTPD_CONF@
|
|
INIT_DIR=@init_dir@
|
|
-INIT_OPTS=-o root -g root
|
|
+INIT_OPTS=-o root -g wheel
|
|
CGICFGDIR=$(CGIDIR)
|
|
PERLDIR=@PERLDIR@
|
|
|
|
@@ -69,74 +68,6 @@
|
|
cd $(SRC_BASE) && $(MAKE)
|
|
cd $(SRC_CGI) && $(MAKE)
|
|
cd $(SRC_HTM) && $(MAKE)
|
|
- if [ x$(USE_EVENTBROKER) = xyes ]; then \
|
|
- cd $(SRC_MODULE) && $(MAKE); \
|
|
- fi
|
|
-
|
|
- @echo ""
|
|
- @echo "*** Compile finished ***"
|
|
- @echo ""
|
|
- @echo "If the main program and CGIs compiled without any errors, you"
|
|
- @echo "can continue with installing Nagios as follows (type 'make'"
|
|
- @echo "without any arguments for a list of all possible options):"
|
|
- @echo ""
|
|
- @echo " make install"
|
|
- @echo " - This installs the main program, CGIs, and HTML files"
|
|
- @echo ""
|
|
- @echo " make install-init"
|
|
- @echo " - This installs the init script in $(DESTDIR)$(INIT_DIR)"
|
|
- @echo ""
|
|
- @echo " make install-commandmode"
|
|
- @echo " - This installs and configures permissions on the"
|
|
- @echo " directory for holding the external command file"
|
|
- @echo ""
|
|
- @echo " make install-config"
|
|
- @echo " - This installs *SAMPLE* config files in $(DESTDIR)$(CFGDIR)"
|
|
- @echo " You'll have to modify these sample files before you can"
|
|
- @echo " use Nagios. Read the HTML documentation for more info"
|
|
- @echo " on doing this. Pay particular attention to the docs on"
|
|
- @echo " object configuration files, as they determine what/how"
|
|
- @echo " things get monitored!"
|
|
- @echo ""
|
|
- @echo " make install-webconf"
|
|
- @echo " - This installs the Apache config file for the Nagios"
|
|
- @echo " web interface"
|
|
- @echo ""
|
|
- @echo " make install-exfoliation"
|
|
- @echo " - This installs the Exfoliation theme for the Nagios"
|
|
- @echo " web interface"
|
|
- @echo ""
|
|
- @echo " make install-classicui"
|
|
- @echo " - This installs the classic theme for the Nagios"
|
|
- @echo " web interface"
|
|
- @echo ""
|
|
- @echo ""
|
|
- @echo "*** Support Notes *******************************************"
|
|
- @echo ""
|
|
- @echo "If you have questions about configuring or running Nagios,"
|
|
- @echo "please make sure that you:"
|
|
- @echo ""
|
|
- @echo " - Look at the sample config files"
|
|
- @echo " - Read the documentation on the Nagios Library at:"
|
|
- @echo " http://library.nagios.com"
|
|
- @echo ""
|
|
- @echo "before you post a question to one of the mailing lists."
|
|
- @echo "Also make sure to include pertinent information that could"
|
|
- @echo "help others help you. This might include:"
|
|
- @echo ""
|
|
- @echo " - What version of Nagios you are using"
|
|
- @echo " - What version of the plugins you are using"
|
|
- @echo " - Relevant snippets from your config files"
|
|
- @echo " - Relevant error messages from the Nagios log file"
|
|
- @echo ""
|
|
- @echo "For more information on obtaining support for Nagios, visit:"
|
|
- @echo ""
|
|
- @echo " http://support.nagios.com"
|
|
- @echo ""
|
|
- @echo "*************************************************************"
|
|
- @echo ""
|
|
- @echo "Enjoy."
|
|
- @echo ""
|
|
|
|
nagios:
|
|
cd $(SRC_BASE) && $(MAKE)
|
|
@@ -230,14 +161,10 @@
|
|
$(MAKE) install-basic
|
|
|
|
install-basic:
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
|
|
if [ $(INSTALLPERLSTUFF) = yes ]; then \
|
|
- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
|
|
+ $(BSD_INSTALL_SCRIPT) p1.pl $(DESTDIR)$(BINDIR); \
|
|
fi;
|
|
-
|
|
+
|
|
@echo ""
|
|
@echo "*** Main program, CGIs and HTML files installed ***"
|
|
@echo ""
|
|
@@ -257,20 +184,20 @@
|
|
|
|
|
|
install-config:
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
|
|
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
|
|
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
|
|
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
|
|
- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
|
|
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
|
|
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
|
|
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
|
|
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
|
|
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
|
|
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
|
|
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
|
|
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
|
|
-
|
|
+ [ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)
|
|
+ [ -d $(DESTDIR)$(SAMPDIR)/objects ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)/objects
|
|
+ ${BSD_INSTALL_DATA} -m 644 sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample
|
|
+ ${BSD_INSTALL_DATA} -m 644 sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample
|
|
+ ${BSD_INSTALL_DATA} -m 640 sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample
|
|
+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/templates.cfg $(DESTDIR)$(SAMPDIR)/objects/templates.cfg-sample
|
|
+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/objects/commands.cfg-sample
|
|
+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/contacts.cfg $(DESTDIR)$(SAMPDIR)/objects/contacts.cfg-sample
|
|
+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/timeperiods.cfg $(DESTDIR)$(SAMPDIR)/objects/timeperiods.cfg-sample
|
|
+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/objects/localhost.cfg-sample
|
|
+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/windows.cfg $(DESTDIR)$(SAMPDIR)/objects/windows.cfg-sample
|
|
+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/printer.cfg $(DESTDIR)$(SAMPDIR)/objects/printer.cfg-sample
|
|
+ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/switch.cfg $(DESTDIR)$(SAMPDIR)/objects/switch.cfg-sample
|
|
+
|
|
@echo ""
|
|
@echo "*** Config files installed ***"
|
|
@echo ""
|
|
@@ -287,8 +214,15 @@
|
|
@echo ""
|
|
|
|
install-exfoliation:
|
|
- cp -rf contrib/exfoliation/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets
|
|
- cp -rf contrib/exfoliation/images/* $(DESTDIR)$(HTMLDIR)/images
|
|
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
|
|
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
|
|
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
|
|
+ for file in contrib/exfoliation/stylesheets/* ; \
|
|
+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
|
|
+ for file in contrib/exfoliation/images/*.* ; \
|
|
+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
|
|
+ for file in contrib/exfoliation/images/logos/* ; \
|
|
+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
|
|
|
|
@echo ""
|
|
@echo "*** Exfoliation theme installed ***"
|
|
@@ -316,7 +250,10 @@
|
|
|
|
|
|
install-commandmode:
|
|
- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
|
|
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives
|
|
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/rw
|
|
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CHECKRESULTDIR)
|
|
+ chmod g+s $(DESTDIR)$(LOGDIR)/archives
|
|
chmod g+s $(DESTDIR)$(LOGDIR)/rw
|
|
|
|
@echo ""
|