debian/changelog

@@ -2,8 +2,10 @@ nagios-nrpe (3.2.1-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.
+  * Bump Standards-Version to 4.4.0, no changes.
   * Update gbp.conf to use --source-only-changes by default.
+  * Use /run instead of /var/run for PID.
+    (closes: #932353)
 
  -- Bas Couwenberg <sebastic@debian.org>  Wed, 01 Aug 2018 21:05:50 +0200
 

debian/control

@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9.20160709),
                libssl-dev,
                libwrap0-dev,
                openssl
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-nrpe
 Vcs-Git: https://salsa.debian.org/nagios-team/pkg-nrpe.git
 Homepage: https://github.com/NagiosEnterprises/nrpe

debian/nagios-nrpe-server.init

@@ -18,7 +18,7 @@ DAEMON=/usr/sbin/nrpe
 NAME=nagios-nrpe
 DESC=nagios-nrpe
 CONFIG=/etc/nagios/nrpe.cfg
-PIDDIR=/var/run/nagios
+PIDDIR=/run/nagios
 
 test -x $DAEMON || exit 0
 
@@ -40,7 +40,7 @@ if [ -f /etc/default/nagios-nrpe ]; then
 fi
 if [ "$NICENESS" ]; then NICENESS="-n $NICENESS"; fi
 
-#since /var/run can be wiped completly we create our run directory here
+#since /run can be wiped completly we create our run directory here
 if [ ! -d "$PIDDIR" ]; then 
 	mkdir "$PIDDIR"
 	chown nagios "$PIDDIR"

debian/nagios-nrpe-server.service

@@ -11,11 +11,11 @@ WantedBy=multi-user.target
 [Service]
 Type=simple
 Restart=on-abort
-PIDFile=/var/run/nagios/nrpe.pid
+PIDFile=/run/nagios/nrpe.pid
 EnvironmentFile=-/etc/default/nagios-nrpe-server
 ExecStart=/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -f $NRPE_OPTS
 ExecReload=/bin/kill -HUP $MAINPID
-ExecStopPost=/bin/rm -f /var/run/nagios/nrpe.pid
+ExecStopPost=/bin/rm -f /run/nagios/nrpe.pid
 TimeoutStopSec=60
 User=nagios
 Group=nagios

debian/nagios-nrpe-server.tmpfile

 #Type	Path		Mode	UID	GID	Age	Argument
-d	/var/run/nagios	0755	nagios	nagios	-	-
+d	/run/nagios	0755	nagios	nagios	-	-

debian/rules

@@ -23,7 +23,7 @@ override_dh_auto_configure:
 		--enable-ssl \
 		--with-logdir=/var/log \
 		--with-ssl-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		--with-piddir=/var/run/nagios
+		--with-piddir=/run/nagios
 
 override_dh_auto_build:
 	dh_auto_build -- all