new upstream 2.8.0

scripts/systemd/nut-monitor.service.in

@@ -1,11 +1,26 @@
 [Unit]
 Description=Network UPS Tools - power device monitor and shutdown controller
 After=local-fs.target network.target nut-server.service
+# Note: We do not specify Requires nut-server.service because
+# the `upsd` daemon(s) may be running on a different machine
+# (connected to the UPSes) than the `upsmon` shutdown protector.
+# The "Wants" directive would try to start the nut-server but
+# would not abort if that attempt fails for whatever reason.
+Wants=nut-server.service
+# Extending the unit does not require *this* file to be edited, you
+# can instead drop in an additional piece of configuration, e.g. add
+# a `/etc/systemd/system/nut-monitor.service.d/network.conf` with:
+#   [Unit]
+#   Requires=network-online.target
+#   After=network-online.target
+PartOf=nut.target
 
 [Service]
-ExecStart=@SBINDIR@/upsmon
+EnvironmentFile=-@CONFPATH@/nut.conf
+SyslogIdentifier=%N
+ExecStart=@SBINDIR@/upsmon -F
+ExecReload=@SBINDIR@/upsmon -c reload
 PIDFile=@PIDPATH@/upsmon.pid
-Type=forking
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=nut.target