[icinga-checkins] icinga.org: icinga-core/test/cgis: install: revamp the broker_module entry in icinga. cfg pointing to new module definition #2348

[git at icinga.org]

Module: icinga-core
Branch: test/cgis
Commit: 0c6e534c701743ae365d04472c0641b4c88000f4
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=0c6e534c701743ae365d04472c0641b4c88000f4

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Feb 23 22:12:44 2012 +0100

install: revamp the broker_module entry in icinga.cfg pointing to new module definition #2348

refs #2348

---

 Changelog                                     |    1 +
 module/idoutils/config/idoutils.cfg-sample.in |   19 +++++++++++++++++++
 sample-config/icinga.cfg.in                   |   25 ++++++++++++++++---------
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/Changelog b/Changelog
index f248ef3..4c27ef7 100644
--- a/Changelog
+++ b/Changelog
@@ -20,6 +20,7 @@ ENHANCEMENTS
 * install: change default target location of idomod.o from $bindir to $libdir #2346
 	** packagers dreams come finally true! :)
 * install: introduce "lib/" in default prefix install for modules #2347
+* install: revamp the broker_module entry in icinga.cfg pointing to new module definition #2348
 
 * icinga.spec: use --with-plugin-dir instead of --libexexdir for nagios plugins dir #2344
 
diff --git a/module/idoutils/config/idoutils.cfg-sample.in b/module/idoutils/config/idoutils.cfg-sample.in
index ce0771e..4d15490 100644
--- a/module/idoutils/config/idoutils.cfg-sample.in
+++ b/module/idoutils/config/idoutils.cfg-sample.in
@@ -3,6 +3,25 @@
 # In order to have Icinga run the IDOMOD event broker module, you'll need
 # to place a file like this into modules/ by default, and include that
 # directory in your icinga.cfg
+#
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# Do NOT overwrite modules while they are being used by Icinga or Icinga
+# will crash in a fiery display of SEGFAULT glory.
+#
+# The correct/safe way of updating a module is by using one of these methods:
+#    1. Shutdown Icinga, replace the module file, restart Icinga
+#    2. Delete the original module file, move the new module file into place, restart Icinga
+#
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#
+#
+# ATTENTION: DO NOT load the same module here AND via broker_module in icinga.cfg
+# This can lead into problems with races on ressources.
+
 
 define module{
         module_name     idomod
diff --git a/sample-config/icinga.cfg.in b/sample-config/icinga.cfg.in
index cae695e..9600904 100644
--- a/sample-config/icinga.cfg.in
+++ b/sample-config/icinga.cfg.in
@@ -228,7 +228,10 @@ event_broker_options=-1
 
 
 # EVENT BROKER MODULE(S)
-# This directive is used to specify an event broker module that should
+# ----> use the new *module definition* instead:
+# ----> http://docs.icinga.org/latest/en/objectdefinitions.html
+#
+# This directive can be used to specify an event broker module that should
 # by loaded by Icinga at startup.  Use multiple directives if you want
 # to load more than one module.  Arguments that should be passed to
 # the module at startup are seperated from the module path by a space.
@@ -236,23 +239,27 @@ event_broker_options=-1
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#
 # Do NOT overwrite modules while they are being used by Icinga or Icinga
-# will crash in a fiery display of SEGFAULT glory.  This is a bug/limitation
-# either in dlopen(), the kernel, and/or the filesystem.  And maybe Icinga...
+# will crash in a fiery display of SEGFAULT glory.
 #
 # The correct/safe way of updating a module is by using one of these methods:
 #    1. Shutdown Icinga, replace the module file, restart Icinga
 #    2. Delete the original module file, move the new module file into place, restart Icinga
 #
-# Example:
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#
+# IDOUtils idomod.o should be enabled using the module definition,
+# i.e. using a package. First check that, and if not, you can
+# enable it here. 
+#
+# ATTENTION: DO NOT load the same module here AND as a module definition.
+# This can lead into problems with races on ressources.
 #
+# Example:
 #   broker_module=<modulepath> [moduleargs]
 
-#broker_module=/somewhere/module1.o
-#broker_module=/somewhere/module2.o arg1 arg2=3 debug=0
-
-# Uncomment this to enable idomod.o
 #broker_module=@libdir@/idomod.o config_file=@sysconfdir@/idomod.cfg