From eb60ccf81e9e4802bbbb908576dac165c0251787 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 9 May 2018 07:46:31 +0200
Subject: [PATCH] sysutils/nut: merge version 1.0 from master

---
 sysutils/nut/Makefile                         |  3 +-
 .../nut/src/etc/inc/plugins.inc.d/nut.inc     | 49 ++++++++++---------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 56411d020..fcd9b734e 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,8 +1,7 @@
 PLUGIN_NAME=		nut
-PLUGIN_VERSION=		0.6
+PLUGIN_VERSION=		1.0
 PLUGIN_COMMENT=		Network UPS Tools
 PLUGIN_DEPENDS=		nut
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
-PLUGIN_DEVEL=		yes
 
 .include "../../Mk/plugins.mk"
diff --git a/sysutils/nut/src/etc/inc/plugins.inc.d/nut.inc b/sysutils/nut/src/etc/inc/plugins.inc.d/nut.inc
index cac1ddff4..abacdd277 100644
--- a/sysutils/nut/src/etc/inc/plugins.inc.d/nut.inc
+++ b/sysutils/nut/src/etc/inc/plugins.inc.d/nut.inc
@@ -44,30 +44,35 @@ function nut_services()
 {
     $services = array();
 
-    if (nut_enabled()) {
-        $services[] = array(
-            'description' => gettext('Network UPS Tools'),
-            'configd' => array(
-                'restart' => array('nut restart'),
-                'start' => array('nut start'),
-                'stop' => array('nut stop'),
-            ),
-            'name' => 'nut',
-            'pidfile' => '/var/db/nut/upsd.pid'
-        );
+    if (!nut_enabled()) {
+        return $services;
     }
-    if (nut_enabled() && nut_netclient()) {
-        $services[] = array(
-            'description' => gettext('Network UPS Monitor'),
-            'configd' => array(
-                'restart' => array('nut restart'),
-                'start' => array('nut start'),
-                'stop' => array('nut stop'),
-            ),
-            'name' => 'upsmon',
-            'pidfile' => '/var/db/nut/upsmon.pid'
-        );
+
+    $services[] = array(
+        'description' => gettext('Network UPS Monitor'),
+        'configd' => array(
+            'restart' => array('nut restart'),
+            'start' => array('nut start'),
+            'stop' => array('nut stop'),
+        ),
+        'pidfile' => '/var/db/nut/upsmon.pid',
+        'name' => 'nut_upsmon',
+    );
+
+    if (nut_netclient()) {
+        return $services;
     }
 
+    $services[] = array(
+        'description' => gettext('Network UPS Tools'),
+        'configd' => array(
+            'restart' => array('nut restart'),
+            'start' => array('nut start'),
+            'stop' => array('nut stop'),
+        ),
+        'pidfile' => '/var/db/nut/upsd.pid',
+        'name' => 'nut_daemon',
+    );
+
     return $services;
 }