From f41e60318efcb1dd05a878b8cfc58cc81b811147 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 18 Aug 2022 14:10:25 +0200
Subject: [PATCH] dns/bind: migrate to NAME_setup use

PR: https://github.com/opnsense/core/issues/5917
---
 dns/bind/Makefile                                         | 1 +
 .../src/opnsense/service/conf/actions.d/actions_bind.conf | 8 ++++----
 .../src/opnsense/service/templates/OPNsense/Bind/named    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dns/bind/Makefile b/dns/bind/Makefile
index 4631ccc03..a65ef23a5 100644
--- a/dns/bind/Makefile
+++ b/dns/bind/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		bind
 PLUGIN_VERSION=		1.24
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		BIND domain name service
 PLUGIN_DEPENDS=		bind916
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/dns/bind/src/opnsense/service/conf/actions.d/actions_bind.conf b/dns/bind/src/opnsense/service/conf/actions.d/actions_bind.conf
index e272a068f..d4f93e257 100644
--- a/dns/bind/src/opnsense/service/conf/actions.d/actions_bind.conf
+++ b/dns/bind/src/opnsense/service/conf/actions.d/actions_bind.conf
@@ -1,5 +1,5 @@
 [start]
-command:/usr/local/opnsense/scripts/OPNsense/Bind/setup.sh;/usr/local/etc/rc.d/named start
+command:/usr/local/etc/rc.d/named start
 parameters:
 type:script
 message:starting BIND
@@ -11,13 +11,13 @@ type:script
 message:stopping BIND
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/Bind/setup.sh;/usr/local/etc/rc.d/named restart
+command:/usr/local/etc/rc.d/named restart
 parameters:
 type:script
 message:restarting BIND
 
 [status]
-command:/usr/local/etc/rc.d/named status;exit 0
+command:/usr/local/etc/rc.d/named status; exit 0
 parameters:
 type:script_output
 message:request BIND status
@@ -35,7 +35,7 @@ type:script
 message:fetching DNSBLs
 
 [dnsblcron]
-command:/usr/local/opnsense/scripts/OPNsense/Bind/dnsbl.sh;/usr/local/etc/rc.d/named reload
+command:/usr/local/opnsense/scripts/OPNsense/Bind/dnsbl.sh; /usr/local/etc/rc.d/named reload
 parameters:
 type:script
 message:fetching DNSBLs and restart
diff --git a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named
index 1a4c02a00..34d82fcae 100644
--- a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named
+++ b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named
@@ -1,5 +1,4 @@
 {% if helpers.exists('OPNsense.bind.general.enabled') and OPNsense.bind.general.enabled == '1' %}
-named_var_script="/usr/local/opnsense/scripts/OPNsense/Bind/setup.sh"
 {% if helpers.exists('OPNsense.bind.general.disablev6') and OPNsense.bind.general.disablev6 == '1' %}
 named_flags="-4"
 {% endif %}
@@ -8,6 +7,7 @@ named_flags="-4"
 named_dnsbl="{{ OPNsense.bind.dnsbl.type }}"
 {% endif %}
 {% endif %}
+named_setup="/usr/local/opnsense/scripts/OPNsense/Bind/setup.sh"
 named_enable="YES"
 {% else %}
 named_enable="NO"