[Pkg-nagios-changes] [pkg-nsca] 01/11: Use Icinga instead of Nagios (nagios3 removed from Debian).

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pkg-nsca.

commit 5ec308a94ea82d2e8a7cc2947d091cecd0a80bb9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 9 16:13:23 2016 +0100

    Use Icinga instead of Nagios (nagios3 removed from Debian).
---
 debian/changelog                                  | 2 ++
 debian/control                                    | 2 +-
 debian/nsca.config                                | 6 +++++-
 debian/nsca.postinst                              | 6 +++++-
 debian/patches/04_nsca.cfg_nagios_vs_nagios.patch | 4 ++--
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62d4f5f..b58c8bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ nsca (2.9.1-4) UNRELEASED; urgency=medium
     (closes: #663047)
   * Add upstream patch to fix reserved identifier violation.
   * Add upstream patch to fix NSCA close/POLLNVAL/accept bug causing hang.
+  * Use Icinga instead of Nagios (nagios3 removed from Debian).
+    (closes: #846870)
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 04 Dec 2016 00:04:22 +0100
 
diff --git a/debian/control b/debian/control
index 52ed25d..e54c980 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Depends: confget,
          nsca-client,
          ${shlibs:Depends},
          ${misc:Depends}
-Suggests: nagios3,
+Suggests: icinga | icinga2,
           nagios-plugins-basic | nagios-plugins
 Description: Nagios service monitor agent
  This addon allows you to send service check results to a central
diff --git a/debian/nsca.config b/debian/nsca.config
index 69fda96..f2412db 100644
--- a/debian/nsca.config
+++ b/debian/nsca.config
@@ -24,7 +24,11 @@ run_nsca(){
 	;;
 	# anything else is "undefined", so we then use our defaults
 	*)
-		if which nagios >/dev/null 2>&2 || which nagios2 >/dev/null; then
+		if which icinga  >/dev/null 2>&1 ||
+		   which icinga2 >/dev/null 2>&1 ||
+		   which nagios3 >/dev/null 2>&1 ||
+		   which nagios2 >/dev/null 2>&1 ||
+		   which nagios  >/dev/null 2>&1 ; then
 			echo "true"
 		else
 			echo "false"
diff --git a/debian/nsca.postinst b/debian/nsca.postinst
index d6521b4..5f1a7de 100644
--- a/debian/nsca.postinst
+++ b/debian/nsca.postinst
@@ -44,7 +44,11 @@ run_nsca(){
 	;;
 	# anything else is "undefined", so we then use our defaults
 	*)
-		if which nagios >/dev/null 2>&1 || which nagios3 >/dev/null 2>&1 || which nagios2 >/dev/null 2>&1 ; then
+		if which icinga  >/dev/null 2>&1 || \
+		   which icinga2 >/dev/null 2>&1 || \
+		   which nagios3 >/dev/null 2>&1 || \
+		   which nagios2 >/dev/null 2>&1 || \
+		   which nagios  >/dev/null 2>&1 ; then
 			echo "true"
 		else
 			echo "false"
diff --git a/debian/patches/04_nsca.cfg_nagios_vs_nagios.patch b/debian/patches/04_nsca.cfg_nagios_vs_nagios.patch
index 3218f5e..c054d4a 100644
--- a/debian/patches/04_nsca.cfg_nagios_vs_nagios.patch
+++ b/debian/patches/04_nsca.cfg_nagios_vs_nagios.patch
@@ -13,9 +13,9 @@ Author: Sean Finney <seanius at debian.org>
 +# Note to debian users: icinga and nagios3 have
 +# different default locations for this file.  this is the
 +# default location for icinga
-+# command_file=/var/lib/icinga/rw/icinga.cmd
++command_file=/var/lib/icinga/rw/icinga.cmd
 +# and this is the default location for nagios3:
-+command_file=/var/lib/nagios3/rw/nagios.cmd
++#command_file=/var/lib/nagios3/rw/nagios.cmd
  
  # ALTERNATE DUMP FILE
  # This is used to specify an alternate file the daemon should

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nsca.git