From 3d4205c74c657895fc8710310de77515d7c39e17 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 3 Dec 2022 14:36:11 +0100
Subject: [PATCH] net/wireguard: rearrange post-start duties #3206

---
 net/wireguard/Makefile                                |  2 +-
 net/wireguard/src/etc/rc.syshook.d/start/50-wireguard |  5 +----
 .../src/opnsense/scripts/OPNsense/Wireguard/post.sh   | 11 +++++++++++
 .../service/conf/actions.d/actions_wireguard.conf     |  4 ++--
 .../service/templates/OPNsense/Wireguard/wireguard    |  7 -------
 5 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100755 net/wireguard/src/opnsense/scripts/OPNsense/Wireguard/post.sh

diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index d8d1c8345..bc605c893 100644
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		wireguard
 PLUGIN_VERSION=		1.13
-PLUGIN_REVISION=	2
+PLUGIN_REVISION=	3
 PLUGIN_COMMENT=		WireGuard VPN service
 PLUGIN_DEPENDS=		wireguard-tools
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/wireguard/src/etc/rc.syshook.d/start/50-wireguard b/net/wireguard/src/etc/rc.syshook.d/start/50-wireguard
index c5a419c73..78ab22804 100755
--- a/net/wireguard/src/etc/rc.syshook.d/start/50-wireguard
+++ b/net/wireguard/src/etc/rc.syshook.d/start/50-wireguard
@@ -1,7 +1,4 @@
 #!/bin/sh
 
 # start again to fix problems with failed name resolution (no need to restart)
-/usr/local/etc/rc.d/wireguard start
-
-# reconfigure routing for wireguard
-/usr/local/etc/rc.routing_configure
+configctl -dq wireguard start
diff --git a/net/wireguard/src/opnsense/scripts/OPNsense/Wireguard/post.sh b/net/wireguard/src/opnsense/scripts/OPNsense/Wireguard/post.sh
new file mode 100755
index 000000000..375ca3835
--- /dev/null
+++ b/net/wireguard/src/opnsense/scripts/OPNsense/Wireguard/post.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ -f /etc/rc.conf.d/wireguard ]; then
+	. /etc/rc.conf.d/wireguard
+fi
+
+for interface in ${wireguard_interfaces}; do
+	ifconfig ${interface} group wireguard
+done
+
+/usr/local/etc/rc.routing_configure
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 109f209aa..b2b96828f 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,5 +1,5 @@
 [start]
-command:/usr/local/etc/rc.d/wireguard start; /usr/local/etc/rc.routing_configure
+command:/usr/local/etc/rc.d/wireguard start; /usr/local/opnsense/scripts/OPNsense/Wireguard/post.sh
 parameters:
 type:script
 message:Starting WireGuard
@@ -11,7 +11,7 @@ type:script
 message:Stopping WireGuard
 
 [restart]
-command:/usr/local/etc/rc.d/wireguard restart; /usr/local/etc/rc.routing_configure
+command:/usr/local/etc/rc.d/wireguard restart; /usr/local/opnsense/scripts/OPNsense/Wireguard/post.sh
 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 95627a5f4..c4c12667a 100644
--- a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard
+++ b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard
@@ -10,13 +10,6 @@ wireguard_enable="YES"
 {%     endfor %}
 {%   endif %}
 wireguard_interfaces="{{ activeservers | join(' ') }}"
-start_postcmd=opnsense_postcmd
-opnsense_postcmd()
-{
-	for interface in ${wireguard_interfaces}; do
-		ifconfig ${interface} group wireguard
-	done
-}
 {% else %}
 wireguard_enable="NO"
 {% endif %}