[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: idoutils: install sample ( commented) config in modules/idoutils.cfg using new 'module' object config #162

[git at icinga.org]

Module: icinga-core
Branch: mfriedrich/core
Commit: 073d6e35dd4ea8b4c689d7218646499cec1015d5
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=073d6e35dd4ea8b4c689d7218646499cec1015d5

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Apr 30 14:25:41 2011 +0200

idoutils: install sample (commented) config in modules/idoutils.cfg using new 'module' object config #162

refs #162

---

 Changelog                              |    1 +
 module/idoutils/Makefile.in            |    2 +-
 module/idoutils/config/idoutils.cfg.in |   15 +++++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Changelog b/Changelog
index 1bc8c32..fdb673f 100644
--- a/Changelog
+++ b/Changelog
@@ -33,6 +33,7 @@ ENHANCEMENTS
 * idoutils: non-blocking icinga core while config dump at startup to ido2db #866
 	** main thread dumps in dynamic buffer, worker threads reads and processes data
 	** this causes more cpu usage in the beginning, but afterall Icinga core won't block
+* idoutils: install sample (commented) config in modules/idoutils.cfg using new 'module' object config #162
 
 * config: increase default debug file size to 100M #1316
 
diff --git a/module/idoutils/Makefile.in b/module/idoutils/Makefile.in
index cc4c84e..a8a2bc5 100644
--- a/module/idoutils/Makefile.in
+++ b/module/idoutils/Makefile.in
@@ -46,5 +46,5 @@ install:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
 	$(INSTALL) -m 664 $(INSTALL_OPTS) config/ido2db.cfg-sample $(DESTDIR)$(CFGDIR)
 	$(INSTALL) -m 664 $(INSTALL_OPTS) config/idomod.cfg-sample $(DESTDIR)$(CFGDIR)
-#	$(INSTALL) -m 664 $(INSTALL_OPTS) config/idoutils.cfg $(DESTDIR)$(CFGDIR)/modules/
+	$(INSTALL) -m 664 $(INSTALL_OPTS) config/idoutils.cfg $(DESTDIR)$(CFGDIR)/modules/
 
diff --git a/module/idoutils/config/idoutils.cfg.in b/module/idoutils/config/idoutils.cfg.in
index 8f4d12a..c24fcdb 100644
--- a/module/idoutils/config/idoutils.cfg.in
+++ b/module/idoutils/config/idoutils.cfg.in
@@ -3,10 +3,13 @@
 # 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
+#
+# Note: The sample bewlow remains commented, in order not to harm
+# existing setups. make install-idoutils will override this file!
 
-define module{
-        module_name     idomod
-        module_type     neb
-        path            @bindir@/idomod.o
-        args            config_file=@sysconfdir@/idomod.cfg
-}
+#define module{
+#        module_name     idomod
+#        module_type     neb
+#        path            @bindir@/idomod.o
+#        args            config_file=@sysconfdir@/idomod.cfg
+#	}