Modify monit configuration to be able to monitor the process status.

openmediavault · Mar 28, 2017 · 526211e · 526211e
1 parent a83e8f2
commit 526211e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/deb/openmediavault-nut/debian/changelog b/deb/openmediavault-nut/debian/changelog
@@ -1,3 +1,9 @@
+openmediavault-nut (3.2.10) stable; urgency=low
+
+  * Modify monit configuration to be able to monitor the process status.
+
+ -- Volker Theile <volker.theile@openmediavault.org>  Tue, 28 Mar 2017 21:17:47 +0200
+
 openmediavault-nut (3.2.9) stable; urgency=low
 
   * Fix first installation bug.

diff --git a/deb/openmediavault-nut/debian/control b/deb/openmediavault-nut/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.openmediavault.org
 
 Package: openmediavault-nut
 Architecture: all
-Depends: openmediavault (>= 3.0.60), nut (>= 2.6.4), udev
+Depends: openmediavault (>= 3.0.68), nut (>= 2.6.4), udev
 Priority: optional
 Description: OpenMediaVault Network UPS Tools (NUT) plugin
  Network UPS Tools (NUT) is a client/server monitoring system that

diff --git a/deb/openmediavault-nut/usr/share/openmediavault/mkconf/monit.d/nut b/deb/openmediavault-nut/usr/share/openmediavault/mkconf/monit.d/nut
@@ -31,7 +31,7 @@ rm -f ${OMV_MONIT_SERVICE_NUT_CONFIG}
 [ "$(omv_config_get "//services/nut/enable")" = "0" ] && exit 0
 
 cat <<EOF > ${OMV_MONIT_SERVICE_NUT_CONFIG}
-check process nut-server with pidfile /var/run/nut/upsd.pid
+check process nut-server with matching upsd
   group nut
   start program = "/bin/systemctl start nut-server"
   stop program = "/bin/systemctl stop nut-server"
@@ -49,7 +49,7 @@ xmlstarlet sel -t -m "//system/email" \
 
 cat <<EOF >> ${OMV_MONIT_SERVICE_NUT_CONFIG}
 
-check process nut-monitor with pidfile /var/run/nut/upsmon.pid
+check process nut-monitor with matching upsmon
   group nut
   start program = "/bin/systemctl start nut-monitor"
   stop program = "/bin/systemctl stop nut-monitor"