From 5e445a4dde147d7c93ceb81e9a3f1d005a4b859c Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sun, 11 Jul 2021 14:39:52 +0200
Subject: [PATCH] net-mgmt/zabbix-agent: post-merge fixes, refs #2348

---
 .../app/controllers/OPNsense/ZabbixAgent/forms/settings.xml  | 5 ++---
 .../templates/OPNsense/ZabbixAgent/zabbix_agentd.conf        | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
index 9735389b8..8af59acea 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
@@ -45,9 +45,8 @@
         <field>
             <id>zabbixagent.settings.main.syslogEnable</id>
             <label>Log to syslog</label>
-            <type>text</type>
-            <help><![CDATA[Use syslog, instead of logging to file.]]></help>
-            <advanced>true</advanced>
+            <type>checkbox</type>
+            <help><![CDATA[Use syslog instead of logging to a file.]]></help>
         </field>
         <field>
             <id>zabbixagent.settings.main.logFileSize</id>
diff --git a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf
index d38321723..3974f4408 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf
+++ b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf
@@ -8,7 +8,6 @@
 
 PidFile=/var/run/zabbix/zabbix_agentd.pid
 
-
 {% if helpers.exists('OPNsense.ZabbixAgent.settings.main.syslogEnable') and OPNsense.ZabbixAgent.settings.main.syslogEnable|default('0') == '1' %}
 LogType=system
 {% else %}
@@ -17,7 +16,6 @@ LogFile=/var/log/zabbix/zabbix_agentd.log
 LogFileSize={{OPNsense.ZabbixAgent.settings.main.logFileSize}}
 {% endif %}
 
-
 DebugLevel={{OPNsense.ZabbixAgent.settings.main.debugLevel|replace("val_", "")}}
 
 {% if helpers.exists('OPNsense.ZabbixAgent.settings.main.sourceIP') %}