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

[Alexander Wirt]

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

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

commit a040168fb633caaf8ab3a5b3094e061abd38c525
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Dec 3 21:51:16 2016 +0100

    Use Icinga instead of Nagios (nagios3 removed from Debian).
    
    Closes: #846867
    Thanks: Bas Couwenberg for the patch
---
 debian/README.Debian                     |  8 ++------
 debian/control                           |  6 +++---
 debian/nsca-ng-server.init               | 10 +++++-----
 debian/patches/nsca-ng.cfg_debian_config | 14 +++++++-------
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 667c0e0..cc95e25 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,12 +11,8 @@ To enable the daemon set NSCA-NG in /etc/default/nsca-ng-server to "yes".
 Using nsca-ng
 -------------
 
-If you want to use nsca-ng with Icinga just comment out the  "command_file" for nagios3
-and enable the prepared "command_file" for icinga.
-
-If you are missing your command socket it is a good idea to read either
-/usr/share/doc/nagios3/README.Debian or /usr/share/doc/icinga/README.Debian
-(the "External Commands" paragraph).
+If you are missing your command socket it is a good idea to read
+/usr/share/doc/icinga/README.Debian (the "External Commands" paragraph).
 
 The daemon is bound to localhost by default, you probably want to change this in 
 "/etc/nsca-ng/nsca-ng.local.cfg" when you are done with your configuration.
diff --git a/debian/control b/debian/control
index 26e792e..28e97a8 100644
--- a/debian/control
+++ b/debian/control
@@ -29,11 +29,11 @@ Package: nsca-ng-server
 Architecture: any
 Section: net
 Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
-Recommends: nagios3 | icinga
+Recommends: icinga
 Description: Monitoring command acceptor
- The NSCA-ng server makes the Nagios command file accessible from remote
+ The NSCA-ng server makes the Icinga command file accessible from remote
  systems.  This allows for submitting passive check results, downtimes, and many
- other commands to Nagios or Icinga.
+ other commands to Icinga.
  .
  The communication with clients is TLS
  encrypted and authenticated using pre-shared keys (as per RFC 4279).  The
diff --git a/debian/nsca-ng-server.init b/debian/nsca-ng-server.init
index 9e16c0e..0e35bd0 100644
--- a/debian/nsca-ng-server.init
+++ b/debian/nsca-ng-server.init
@@ -4,15 +4,15 @@
 # Provides:          nsca-ng
 # Required-Start:    $remote_fs $network $syslog
 # Required-Stop:     $remote_fs $network $syslog
-# Should-Start:      $named nagios3 icinga
-# Should-Stop:       $named nagios3 icinga
+# Should-Start:      $named icinga
+# Should-Stop:       $named icinga
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Accept monitoring commands
-# Description:       The NSCA-ng server makes the Nagios command file accessible
+# Description:       The NSCA-ng server makes the Icinga command file accessible
 #                    from remote systems.  This allows for submitting passive
-#                    check results, downtimes, and many other commands to Nagios
-#                    or Icinga.
+#                    check results, downtimes, and many other commands to
+#                    Icinga.
 ### END INIT INFO
 
 PATH='/sbin:/usr/sbin:/bin:/usr/bin'
diff --git a/debian/patches/nsca-ng.cfg_debian_config b/debian/patches/nsca-ng.cfg_debian_config
index 932f88f..873e7a0 100644
--- a/debian/patches/nsca-ng.cfg_debian_config
+++ b/debian/patches/nsca-ng.cfg_debian_config
@@ -3,17 +3,17 @@ Author: Alexander Wirt <formorer at debian.org>
 
 --- a/etc/nsca-ng.cfg
 +++ b/etc/nsca-ng.cfg
-@@ -8,9 +8,28 @@
+@@ -6,11 +6,27 @@
  #
- # Most probably, you'll have to specify the path to the Nagios command file.
+ 
+ #
+-# Most probably, you'll have to specify the path to the Nagios command file.
++# Most probably, you'll have to specify the path to the Icinga command file.
  #
 -command_file = "/usr/local/nagios/var/rw/nagios.cmd"
 +
-+# command_file for nagios3
-+command_file = "/var/lib/nagios3/rw/nagios.cmd"
-+
 +# command_file for icinga
-+#command_file= "/var/lib/icinga/rw/icinga.cmd"
++command_file= "/var/lib/icinga/rw/icinga.cmd"
 +
 +# Debian specific settings
 +listen = "localhost:5668" # only listen on localhost. If you use systemd this
@@ -33,7 +33,7 @@ Author: Alexander Wirt <formorer at debian.org>
  # These configuration settings are optional.
  #
  # 	listen = "monitoring.example.com:5668"  # Default: "*".
-@@ -105,6 +124,9 @@
+@@ -105,6 +121,9 @@ command_file = "/usr/local/nagios/var/rw
  # commands), at least one "commands", "hosts", and/or "services" expression must
  # be specified.
  #

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