[pkg-nagios-changes] [Git][nagios-team/pkg-nsca][master] 5 commits: Use /run instead of /var/run.

Thu Jul 18 11:39:26 BST 2019


Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-nsca


Commits:
7ef9324e by Bas Couwenberg at 2019-07-18T10:17:42Z
Use /run instead of /var/run.

- - - - -
0eb6d11b by Bas Couwenberg at 2019-07-18T10:19:33Z
Update command_file path for icinga2.

- - - - -
ebd28b66 by Bas Couwenberg at 2019-07-18T10:26:49Z
Drop icinga from Suggests.

- - - - -
77ed4668 by Bas Couwenberg at 2019-07-18T10:31:48Z
Use section 8 for manpages.

- - - - -
17a08ad1 by Bas Couwenberg at 2019-07-18T10:36:54Z
Fix update-inetd command in postrm.

- - - - -


10 changed files:

- debian/changelog
- debian/control
- debian/nsca-client.manpages
- debian/nsca.1 → debian/nsca.8
- debian/nsca.init
- debian/nsca.manpages
- debian/nsca.postrm
- debian/patches/04_nsca.cfg_nagios_vs_nagios.patch
- debian/patches/12_pid-directory.patch
- debian/send_nsca.1 → debian/send_nsca.8


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,11 @@ nsca (2.9.2-3) UNRELEASED; urgency=medium
   * Drop autopkgtest to test installability.
   * Add lintian override for testsuite-autopkgtest-missing.
   * Bump Standards-Version to 4.3.0, no changes.
+  * Use /run instead of /var/run.
+  * Update command_file path for icinga2.
+  * Drop icinga from Suggests.
+  * Use section 8 for manpages.
+  * Fix update-inetd command in postrm.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 01 Aug 2018 21:06:44 +0200
 


=====================================
debian/control
=====================================
@@ -20,7 +20,7 @@ Depends: confget,
          nsca-client,
          ${shlibs:Depends},
          ${misc:Depends}
-Suggests: icinga | icinga2,
+Suggests: icinga2,
           monitoring-plugins-basic | monitoring-plugins
 Description: Nagios service monitor agent
  This addon allows you to send service check results to a central


=====================================
debian/nsca-client.manpages
=====================================
@@ -1 +1 @@
-debian/send_nsca.1
+debian/send_nsca.8


=====================================
debian/nsca.1 → debian/nsca.8
=====================================
@@ -1,4 +1,4 @@
-.TH nsca "1" "December 2005" "nsca"
+.TH nsca "8" "December 2005" "nsca"
 .SH NAME
 nsca \- Nagios Service Check Acceptor
 


=====================================
debian/nsca.init
=====================================
@@ -17,7 +17,7 @@ NAME=nsca
 DESC="Nagios Service Check Acceptor"
 CONF=/etc/nsca.cfg
 OPTS="--daemon -c $CONF"
-PIDFILE="/var/run/nsca.pid"
+PIDFILE="/run/nsca.pid"
 
 test -f $DAEMON || exit 0
 
@@ -44,8 +44,8 @@ if [ -z "$PIDFILE" ];  then
     exit 1
 fi
 
-if [ ! -d "/var/run/nagios" ]; then
-    mkdir -p /var/run/nagios || { log_failure_msg "couldn't create /var/run/nagios"; exit 1; }
+if [ ! -d "/run/nagios" ]; then
+    mkdir -p /run/nagios || { log_failure_msg "couldn't create /run/nagios"; exit 1; }
 fi
 
 case "$1" in


=====================================
debian/nsca.manpages
=====================================
@@ -1 +1 @@
-debian/nsca.1
+debian/nsca.8


=====================================
debian/nsca.postrm
=====================================
@@ -3,7 +3,7 @@
 if [ "$1" = "purge" ] ; then
 	# to remain backwards-compatible with inetd and the like:
 	if which update-inetd >/dev/null 2>&1; then
-		update-inetd --group OTHER --remove '5667\t\tstream\ttcp\tnowait\tnagios\t/usr/sbin/tcpd\t/usr/sbin/nsca -c /etc/nsca.cfg -- inetd' || true
+		update-inetd --remove '5667\t\tstream\ttcp\tnowait\tnagios\t/usr/sbin/tcpd\t/usr/sbin/nsca -c /etc/nsca.cfg -- inetd' || true
 	fi
 fi
 


=====================================
debian/patches/04_nsca.cfg_nagios_vs_nagios.patch
=====================================
@@ -4,7 +4,16 @@ Forwarded: not-needed
 
 --- a/sample-config/nsca.cfg.in
 +++ b/sample-config/nsca.cfg.in
-@@ -89,9 +89,12 @@ debug=0
+@@ -73,7 +73,7 @@ nsca_group=@nsca_grp@
+ # NOTE: if you specify this option, the command file will be opened
+ #       relative to this directory.
+ 
+-#nsca_chroot=/var/run/nagios/rw
++#nsca_chroot=/run/nagios/rw
+ 
+ 
+ 
+@@ -89,9 +89,10 @@ debug=0
  # COMMAND FILE
  # This is the location of the Nagios command file that the daemon
  # should write all service check results that it receives.
@@ -13,20 +22,18 @@ Forwarded: not-needed
 -
 +# 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
-+# and this is the default location for nagios3:
-+#command_file=/var/lib/nagios3/rw/nagios.cmd
++# default location for icinga2
++command_file=/var/run/icinga2/cmd/icinga2.cmd
  
  # ALTERNATE DUMP FILE
  # This is used to specify an alternate file the daemon should
-@@ -103,8 +106,7 @@ command_file=@localstatedir@/rw/nagios.c
+@@ -103,8 +104,7 @@ command_file=@localstatedir@/rw/nagios.c
  # it starts Nagios.  Or you may simply choose to ignore any
  # check results received while Nagios was not running...
  
 -alternate_dump_file=@localstatedir@/rw/nsca.dump
 -
-+alternate_dump_file=/var/run/nagios/nsca.dump
++alternate_dump_file=/run/nagios/nsca.dump
  
  
  # AGGREGATED WRITES OPTION


=====================================
debian/patches/12_pid-directory.patch
=====================================
@@ -10,7 +10,7 @@ Forwarded: not-needed
  # user as a single- or multi-process daemon.
  
 -pid_file=/var/run/nsca.pid
-+pid_file=/var/run/nagios/nsca.pid
++pid_file=/run/nagios/nsca.pid
  
  
  


=====================================
debian/send_nsca.1 → debian/send_nsca.8
=====================================
@@ -1,4 +1,4 @@
-.TH send_nsca "1" "December 2005" "nsca"
+.TH send_nsca "8" "December 2005" "nsca"
 .SH NAME
 send_nsca \- send passive check results to an NSCA daemon
 



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nsca/compare/4a162996527fdc028a41718f8a41f92294b5e855...17a08ad134b565b7d583945a94c53925dc6be481

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nsca/compare/4a162996527fdc028a41718f8a41f92294b5e855...17a08ad134b565b7d583945a94c53925dc6be481
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20190718/37b18d24/attachment-0001.html>
