From 88fc90f4d497ed363abd8f532e1fd60fae3ba117 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Fri, 2 Nov 2018 10:39:53 +0100
Subject: [PATCH] sysutils/nut: add blazer_ser driver (#950)

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

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index bc2e2717a..d58c2f974 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		nut
 PLUGIN_VERSION=		1.3
+PLUGIN_REVISION=    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 9e9ddea08..38ce85959 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
@@ -78,6 +78,20 @@
                 <help>Set extra arguments for this UPS, e.g. "port=auto".</help>
             </field>
         </subtab>
+        <subtab id="nut-ups-blazerser" description="BlazerSerial-Driver">
+            <field>
+                <id>nut.blazerser.enable</id>
+                <label>Enable</label>
+                <type>checkbox</type>
+                <help>Enable the BlazerSerial driver.</help>
+            </field>
+            <field>
+                <id>nut.blazerser.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 13bf3b74f..3419274d3 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
@@ -63,6 +63,16 @@
         <Required>N</Required>
       </args>
     </blazerusb>
+    <blazerser>
+      <enable type="BooleanField">
+        <Required>Y</Required>
+        <default>0</default>
+      </enable>
+      <args type="TextField">
+        <default>port=auto</default>
+        <Required>N</Required>
+      </args>
+    </blazerser>
     <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 fcd3062dd..3b5ee9919 100644
--- a/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/ups.conf
+++ b/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/ups.conf
@@ -23,4 +23,11 @@ driver=blazer_usb
 {{ OPNsense.Nut.blazerusb.args }}
 {%     endif %}
 {%   endif %}
+{%   if helpers.exists('OPNsense.Nut.blazerser.enable') and OPNsense.Nut.blazerser.enable == '1' %}
+[{{ OPNsense.Nut.general.name }}]
+driver=blazer_ser
+{%     if helpers.exists('OPNsense.Nut.blazerser.args') and OPNsense.Nut.blazerser.args != '' %}
+{{ OPNsense.Nut.blazerser.args }}
+{%     endif %}
+{%   endif %}
 {% endif %}