net/wireguard: fix rc stuff (#911)

net/wireguard/Makefile

@@ -1,5 +1,5 @@
 PLUGIN_NAME=		wireguard
-PLUGIN_VERSION=		0.6
+PLUGIN_VERSION=		0.7
 PLUGIN_COMMENT=		WireGuard VPN service
 PLUGIN_DEPENDS=		wireguard
 PLUGIN_MAINTAINER=	m.muenz@gmail.com

net/wireguard/src/etc/inc/plugins.inc.d/wireguard.inc

@@ -60,11 +60,11 @@ function wireguard_interfaces()
         return $interfaces;
     }
     $oic = array('enable' => true);
-    $oic['if'] = 'wg';
+    $oic['if'] = 'wireguard';
     $oic['descr'] = 'WireGuard';
     $oic['type'] = 'group';
     $oic['virtual'] = true;
     $oic['networks'] = array();
-    $interfaces['wg'] = $oic;
+    $interfaces['wireguard'] = $oic;
     return $interfaces;
 }

net/wireguard/src/etc/rc.d/opnsense-wireguard

@@ -9,36 +9,35 @@
 
 . /etc/rc.subr
 
-name=wireguard
+name=opnsense_wireguard
 
-stop_cmd=wireguard_stop
-start_cmd=wireguard_start
-status_cmd=wireguard_status
-rcvar=wireguard_enable
+stop_cmd=opnsense_wireguard_stop
+start_cmd=opnsense_wireguard_start
+status_cmd=opnsense_wireguard_status
+rcvar=opnsense_wireguard_enable
 
 load_rc_config opnsense-wireguard
 command=/usr/local/bin/wg-quick
 
-[ -z "$wireguard_enable" ] && wireguard_enable="NO"
+[ -z "$opnsense_wireguard_enable" ] && opnsense_wireguard_enable="NO"
 
 # stop wireguard
-wireguard_stop()
+opnsense_wireguard_stop()
 {
     echo "stopping wireguard"
-    for STARTER in ${wireguard_config}; do
+    for STARTER in ${opnsense_wireguard_config}; do
         $command down $STARTER
-	ifconfig $STARTER destroy
-	pkill -f wg-quick
     done
+    sleep 5
 }
 
 # start wireguard
-wireguard_start()
+opnsense_wireguard_start()
 {
     echo "starting wireguard"
-    for STARTER in ${wireguard_config}; do
+    for STARTER in ${opnsense_wireguard_config}; do
         $command up $STARTER
-	ifconfig $STARTER group wg
+	ifconfig $STARTER group wireguard
     done
 }
 

net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/opnsense-wireguard

@@ -1,6 +1,6 @@
 {% 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_enable="YES"
+opnsense_wireguard_var_script="/usr/local/opnsense/scripts/OPNsense/Wireguard/setup.sh"
+opnsense_wireguard_enable="YES"
 {%   if helpers.exists('OPNsense.wireguard.server.servers.server') %}
 {%   set activeservers=[] %}
 {%     for servers in helpers.toList('OPNsense.wireguard.server.servers.server') %}
@@ -9,7 +9,7 @@ wireguard_enable="YES"
 {%       endif %}
 {%     endfor %}
 {%   endif %}
-wireguard_config="{{ activeservers | join(' ') }}"
+opnsense_wireguard_config="{{ activeservers | join(' ') }}"
 {% else %}
-wireguard_enable="NO"
+opnsense_wireguard_enable="NO"
 {% endif %}