Source: nsca-ng
Version: 1.4-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: nagios3-rm

Dear Maintainer,

Please update your package to deal with the nagios3 removal from Debian
(#845765).

Consider applying the attached patch.

Kind Regards,

Bas
diff -Nru nsca-ng-1.4/debian/changelog nsca-ng-1.4/debian/changelog
--- nsca-ng-1.4/debian/changelog	2015-06-19 14:09:03.000000000 +0200
+++ nsca-ng-1.4/debian/changelog	2016-12-03 21:02:09.000000000 +0100
@@ -1,3 +1,10 @@
+nsca-ng (1.4-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use Icinga instead of Nagios (nagios3 removed from Debian).
+
+ -- Bas Couwenberg <[email protected]>  Sat, 03 Dec 2016 21:01:44 +0100
+
 nsca-ng (1.4-2) unstable; urgency=medium
 
   * [3928f0d] Create /var/run/nsca-ng if started via systemd (Closes: #784431)
diff -Nru nsca-ng-1.4/debian/control nsca-ng-1.4/debian/control
--- nsca-ng-1.4/debian/control	2015-06-19 13:57:54.000000000 +0200
+++ nsca-ng-1.4/debian/control	2016-12-03 20:59:48.000000000 +0100
@@ -29,11 +29,11 @@
 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 -Nru nsca-ng-1.4/debian/nsca-ng-server.init nsca-ng-1.4/debian/nsca-ng-server.init
--- nsca-ng-1.4/debian/nsca-ng-server.init	2015-06-19 13:57:54.000000000 +0200
+++ nsca-ng-1.4/debian/nsca-ng-server.init	2016-12-03 20:59:17.000000000 +0100
@@ -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 -Nru nsca-ng-1.4/debian/patches/nsca-ng.cfg_debian_config nsca-ng-1.4/debian/patches/nsca-ng.cfg_debian_config
--- nsca-ng-1.4/debian/patches/nsca-ng.cfg_debian_config	2015-06-19 13:57:54.000000000 +0200
+++ nsca-ng-1.4/debian/patches/nsca-ng.cfg_debian_config	2016-12-03 21:01:36.000000000 +0100
@@ -3,17 +3,17 @@
 
 --- 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 @@
  # 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.
  #
diff -Nru nsca-ng-1.4/debian/README.Debian nsca-ng-1.4/debian/README.Debian
--- nsca-ng-1.4/debian/README.Debian	2013-03-16 11:12:01.000000000 +0100
+++ nsca-ng-1.4/debian/README.Debian	2016-12-03 21:01:30.000000000 +0100
@@ -11,12 +11,8 @@
 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.

Reply via email to