From a0483bad7d5adb98177b7c72c4afdd84102bccc6 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Sun, 12 Aug 2018 12:23:36 +0200
Subject: [PATCH] sysutils/nut: add apcsmart driver (#781)

---
 sysutils/nut/Makefile                              |  2 +-
 .../controllers/OPNsense/Nut/forms/settings.xml    | 14 ++++++++++++++
 .../opnsense/mvc/app/models/OPNsense/Nut/Nut.xml   | 12 +++++++++++-
 .../service/templates/OPNsense/Nut/ups.conf        |  7 +++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index fcd9b734e..8c48430bf 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		nut
-PLUGIN_VERSION=		1.0
+PLUGIN_VERSION=		1.1
 PLUGIN_COMMENT=		Network UPS Tools
 PLUGIN_DEPENDS=		nut
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/forms/settings.xml b/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/forms/settings.xml
index 034e057dc..687a41c94 100644
--- a/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/forms/settings.xml
+++ b/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/forms/settings.xml
@@ -50,6 +50,20 @@
                 <help>Set extra arguments for this UPS, e.g. "port=auto".</help>
             </field>
         </subtab>
+        <subtab id="nut-ups-apcsmart" description="APCSMART-Driver">
+            <field>
+                <id>nut.apcsmart.enable</id>
+                <label>Enable</label>
+                <type>checkbox</type>
+                <help>Enable the APCSMART driver.</help>
+            </field>
+            <field>
+                <id>nut.apcsmart.args</id>
+                <label>Extra Arguments</label>
+                <type>text</type>
+                <help>Set extra arguments for this UPS, e.g. "port=auto".</help>
+            </field>
+        </subtab>
         <subtab id="nut-ups-netclient" description="Netclient">
             <field>
                 <id>nut.netclient.enable</id>
diff --git a/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Nut.xml b/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Nut.xml
index 90e16a492..341e90805 100644
--- a/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Nut.xml
+++ b/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Nut.xml
@@ -1,7 +1,7 @@
 <model>
   <mount>//OPNsense/Nut</mount>
   <description>Network UPS Tools</description>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <items>
     <general>
       <enable type="BooleanField">
@@ -43,6 +43,16 @@
         <Required>N</Required>
       </args>
     </usbhid>
+    <apcsmart>
+      <enable type="BooleanField">
+        <Required>Y</Required>
+        <default>0</default>
+      </enable>
+      <args type="TextField">
+        <default>port=auto</default>
+        <Required>N</Required>
+      </args>
+    </apcsmart>
     <netclient>
       <enable type="BooleanField">
         <Required>Y</Required>
diff --git a/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/ups.conf b/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/ups.conf
index 403c41dd6..5b3d5c019 100644
--- a/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/ups.conf
+++ b/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/ups.conf
@@ -9,4 +9,11 @@ driver=usbhid-ups
 {{ OPNsense.Nut.usbhid.args }}
 {%     endif %}
 {%   endif %}
+{%   if helpers.exists('OPNsense.Nut.apcsmart.enable') and OPNsense.Nut.apcsmart.enable == '1' %}
+[{{ OPNsense.Nut.general.name }}]
+driver=apcsmart
+{%     if helpers.exists('OPNsense.Nut.apcsmart.args') and OPNsense.Nut.apcsmart.args != '' %}
+{{ OPNsense.Nut.apcsmart.args }}
+{%     endif %}
+{%   endif %}
 {% endif %}