From 2005d4b37561bcc1aeefeadae105644a671c40d9 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 21 Oct 2022 09:48:19 +0200
Subject: [PATCH] net/wireguard: use NAME_setup

PR: https://github.com/opnsense/core/issues/5917
---
 .../service/conf/actions.d/actions_wireguard.conf      | 10 ++--------
 .../service/templates/OPNsense/Wireguard/wireguard     |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/net/wireguard/src/opnsense/service/conf/actions.d/actions_wireguard.conf b/net/wireguard/src/opnsense/service/conf/actions.d/actions_wireguard.conf
index ac9d353e8..109f209aa 100644
--- a/net/wireguard/src/opnsense/service/conf/actions.d/actions_wireguard.conf
+++ b/net/wireguard/src/opnsense/service/conf/actions.d/actions_wireguard.conf
@@ -1,8 +1,5 @@
 [start]
-command:
-    /usr/local/opnsense/scripts/OPNsense/Wireguard/setup.sh;
-    /usr/local/etc/rc.d/wireguard start;
-    /usr/local/etc/rc.routing_configure
+command:/usr/local/etc/rc.d/wireguard start; /usr/local/etc/rc.routing_configure
 parameters:
 type:script
 message:Starting WireGuard
@@ -14,10 +11,7 @@ type:script
 message:Stopping WireGuard
 
 [restart]
-command:
-    /usr/local/opnsense/scripts/OPNsense/Wireguard/setup.sh;
-    /usr/local/etc/rc.d/wireguard restart;
-    /usr/local/etc/rc.routing_configure
+command:/usr/local/etc/rc.d/wireguard restart; /usr/local/etc/rc.routing_configure
 parameters:
 type:script
 message:Restarting WireGuard
diff --git a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard
index 5cbde5ecf..95627a5f4 100644
--- a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard
+++ b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard
@@ -1,5 +1,5 @@
 {% if helpers.exists('OPNsense.wireguard.general.enabled') and OPNsense.wireguard.general.enabled == '1' %}
-wireguard_var_script="/usr/local/opnsense/scripts/OPNsense/Wireguard/setup.sh"
+wireguard_setup="/usr/local/opnsense/scripts/OPNsense/Wireguard/setup.sh"
 wireguard_enable="YES"
 {%   if helpers.exists('OPNsense.wireguard.server.servers.server') %}
 {%   set activeservers=[] %}