[icinga-checkins] icinga.org: icinga-core/test/cgis: install: fix event handlers cmd file location in contrib #1501

git at icinga.org git at icinga.org
Thu Jun 16 10:03:41 CEST 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Jun  7 16:14:20 2011 +0200

install: fix event handlers cmd file location in contrib #1501

fixes #1501

---

 Changelog                                          |    2 ++
 configure                                          |    6 ++++++
 configure.in                                       |    6 ++++++
 contrib/eventhandlers/.gitignore                   |    4 ++++
 ...ice_checks => disable_active_service_checks.in} |    2 +-
 ...able_notifications => disable_notifications.in} |    2 +-
 ...vice_checks => enable_active_service_checks.in} |    2 +-
 ...nable_notifications => enable_notifications.in} |    2 +-
 8 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 68f6830..64c0952 100644
--- a/Changelog
+++ b/Changelog
@@ -13,6 +13,8 @@ FIXES
 
 * classic ui: fix cross site scripting vulnerability in config.cgi on config expander arguments #1605
 
+* install: fix event handlers cmd file location in contrib #1501
+
 
 1.4.0 - 11/05/2011
 
diff --git a/configure b/configure
index 4fcb82e..65dd09f 100755
--- a/configure
+++ b/configure
@@ -8273,7 +8273,13 @@ fi
 
 
 perl subst $srcdir/include/locations.h
+
 perl subst $srcdir/contrib/eventhandlers/submit_check_result
+perl subst $srcdir/contrib/eventhandlers/disable_active_service_checks
+perl subst $srcdir/contrib/eventhandlers/disable_notifications
+perl subst $srcdir/contrib/eventhandlers/enable_active_service_checks
+perl subst $srcdir/contrib/eventhandlers/enable_notifications
+
 perl subst $srcdir/html/index.html
 perl subst $srcdir/html/menu.html
 
diff --git a/configure.in b/configure.in
index 482ac98..e3be0df 100644
--- a/configure.in
+++ b/configure.in
@@ -1171,7 +1171,13 @@ AC_OUTPUT(Makefile subst solaris/pkginfo base/Makefile common/Makefile contrib/M
 
 
 perl subst $srcdir/include/locations.h
+
 perl subst $srcdir/contrib/eventhandlers/submit_check_result
+perl subst $srcdir/contrib/eventhandlers/disable_active_service_checks
+perl subst $srcdir/contrib/eventhandlers/disable_notifications
+perl subst $srcdir/contrib/eventhandlers/enable_active_service_checks
+perl subst $srcdir/contrib/eventhandlers/enable_notifications
+
 perl subst $srcdir/html/index.html
 perl subst $srcdir/html/menu.html
 
diff --git a/contrib/eventhandlers/.gitignore b/contrib/eventhandlers/.gitignore
index 101294c..a78c1a9 100644
--- a/contrib/eventhandlers/.gitignore
+++ b/contrib/eventhandlers/.gitignore
@@ -1 +1,5 @@
 submit_check_result
+disable_active_service_checks
+disable_notifications
+enable_active_service_checks
+enable_notifications
diff --git a/contrib/eventhandlers/disable_active_service_checks b/contrib/eventhandlers/disable_active_service_checks.in
similarity index 93%
rename from contrib/eventhandlers/disable_active_service_checks
rename to contrib/eventhandlers/disable_active_service_checks.in
index c01f2be..b1d0664 100755
--- a/contrib/eventhandlers/disable_active_service_checks
+++ b/contrib/eventhandlers/disable_active_service_checks.in
@@ -16,7 +16,7 @@
 
 printfcmd="/usr/bin/printf"
 
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
+CommandFile="@EXTCMDFILEDIR@/icinga.cmd"
 
 # get the current date/time in seconds since UNIX epoch
 datetime=`date +%s`
diff --git a/contrib/eventhandlers/disable_notifications b/contrib/eventhandlers/disable_notifications.in
similarity index 93%
rename from contrib/eventhandlers/disable_notifications
rename to contrib/eventhandlers/disable_notifications.in
index a92bb7a..eef90c5 100755
--- a/contrib/eventhandlers/disable_notifications
+++ b/contrib/eventhandlers/disable_notifications.in
@@ -14,7 +14,7 @@
 
 printfcmd="/usr/bin/printf"
 
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
+CommandFile="@EXTCMDFILEDIR@/icinga.cmd"
 
 # get the current date/time in seconds since UNIX epoch
 datetime=`date +%s`
diff --git a/contrib/eventhandlers/enable_active_service_checks b/contrib/eventhandlers/enable_active_service_checks.in
similarity index 93%
rename from contrib/eventhandlers/enable_active_service_checks
rename to contrib/eventhandlers/enable_active_service_checks.in
index 423c8d9..6aa8931 100755
--- a/contrib/eventhandlers/enable_active_service_checks
+++ b/contrib/eventhandlers/enable_active_service_checks.in
@@ -16,7 +16,7 @@
 
 printfcmd="/usr/bin/printf"
 
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
+CommandFile="@EXTCMDFILEDIR@/icinga.cmd"
 
 # get the current date/time in seconds since UNIX epoch
 datetime=`date +%s`
diff --git a/contrib/eventhandlers/enable_notifications b/contrib/eventhandlers/enable_notifications.in
similarity index 93%
rename from contrib/eventhandlers/enable_notifications
rename to contrib/eventhandlers/enable_notifications.in
index 0d3f13d..702f8f8 100755
--- a/contrib/eventhandlers/enable_notifications
+++ b/contrib/eventhandlers/enable_notifications.in
@@ -14,7 +14,7 @@
 
 printfcmd="/usr/bin/printf"
 
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
+CommandFile="@EXTCMDFILEDIR@/icinga.cmd"
 
 # get the current date/time in seconds since UNIX epoch
 datetime=`date +%s`





More information about the icinga-checkins mailing list