From 45d53aed2eaf67b80c73afce9ff6309213bd79a0 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 11 Dec 2018 10:00:12 +0100
Subject: [PATCH] net/wireguard: version 0.8

---
 net/wireguard/Makefile                        |  3 +-
 net/wireguard/src/etc/rc.d/opnsense-wireguard | 44 -------------------
 .../app/views/OPNsense/Wireguard/general.volt |  4 +-
 .../conf/actions.d/actions_wireguard.conf     |  6 +--
 .../templates/OPNsense/Wireguard/+TARGETS     |  2 +-
 .../{opnsense-wireguard => wireguard}         |  8 ++--
 6 files changed, 11 insertions(+), 56 deletions(-)
 delete mode 100755 net/wireguard/src/etc/rc.d/opnsense-wireguard
 rename net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/{opnsense-wireguard => wireguard} (68%)

diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index 9995f73d3..a133ca539 100644
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		wireguard
-PLUGIN_VERSION=		0.7
-PLUGIN_REVISION=    1
+PLUGIN_VERSION=		0.8
 PLUGIN_COMMENT=		WireGuard VPN service
 PLUGIN_DEPENDS=		wireguard
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/wireguard/src/etc/rc.d/opnsense-wireguard b/net/wireguard/src/etc/rc.d/opnsense-wireguard
deleted file mode 100755
index e2e695da1..000000000
--- a/net/wireguard/src/etc/rc.d/opnsense-wireguard
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: opnsense-wireguard
-# REQUIRE: SERVERS
-# KEYWORD: shutdown
-#
-
-. /etc/rc.subr
-
-name=opnsense_wireguard
-
-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 "$opnsense_wireguard_enable" ] && opnsense_wireguard_enable="NO"
-
-# stop wireguard
-opnsense_wireguard_stop()
-{
-    echo "stopping wireguard"
-    for STARTER in ${opnsense_wireguard_config}; do
-        $command down $STARTER
-    done
-    sleep 5
-}
-
-# start wireguard
-opnsense_wireguard_start()
-{
-    echo "starting wireguard"
-    for STARTER in ${opnsense_wireguard_config}; do
-        $command up $STARTER
-	ifconfig $STARTER group wireguard
-    done
-}
-
-run_rc_command $1
diff --git a/net/wireguard/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt b/net/wireguard/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt
index b6952b334..3edd6fb9c 100644
--- a/net/wireguard/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt
+++ b/net/wireguard/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 <!-- Navigation bar -->
 <ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
     <li class="active"><a data-toggle="tab" href="#general">{{ lang._('General') }}</a></li>
-    <li><a data-toggle="tab" href="#servers">{{ lang._('Server') }}</a></li>
+    <li><a data-toggle="tab" href="#servers">{{ lang._('Local') }}</a></li>
     <li><a data-toggle="tab" href="#clients">{{ lang._('Endpoints') }}</a></li>
     <li><a data-toggle="tab" href="#showconf">{{ lang._('List Configuration') }}</a></li>
     <li><a data-toggle="tab" href="#showhandshake">{{ lang._('Handshakes') }}</a></li>
@@ -113,7 +113,7 @@ POSSIBILITY OF SUCH DAMAGE.
 </div>
 
 {{ partial("layout_partials/base_dialog",['fields':formDialogEditWireguardClient,'id':'dialogEditWireguardClient','label':lang._('Edit Endpoint')])}}
-{{ partial("layout_partials/base_dialog",['fields':formDialogEditWireguardServer,'id':'dialogEditWireguardServer','label':lang._('Edit Server')])}}
+{{ partial("layout_partials/base_dialog",['fields':formDialogEditWireguardServer,'id':'dialogEditWireguardServer','label':lang._('Edit Local Configuration')])}}
 
 <script>
 
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 2b6e6d5e1..22c8a042e 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,14 +1,14 @@
 [start]
 command:
     /usr/local/opnsense/scripts/OPNsense/Wireguard/setup.sh;
-    /usr/local/etc/rc.d/opnsense-wireguard start;
+    /usr/local/etc/rc.d/wireguard start;
     /usr/local/etc/rc.routing_configure
 parameters:
 type:script
 message:starting Wireguard
 
 [stop]
-command:/usr/local/etc/rc.d/opnsense-wireguard stop
+command:/usr/local/etc/rc.d/wireguard stop
 parameters:
 type:script
 message:stopping Wireguard
@@ -16,7 +16,7 @@ message:stopping Wireguard
 [restart]
 command:
     /usr/local/opnsense/scripts/OPNsense/Wireguard/setup.sh;
-    /usr/local/etc/rc.d/opnsense-wireguard restart;
+    /usr/local/etc/rc.d/wireguard restart;
     /usr/local/etc/rc.routing_configure
 parameters:
 type:script
diff --git a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/+TARGETS b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/+TARGETS
index ca42cbdba..655def7d1 100644
--- a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/+TARGETS
+++ b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/+TARGETS
@@ -1,2 +1,2 @@
-opnsense-wireguard:/etc/rc.conf.d/opnsense-wireguard
+wireguard:/etc/rc.conf.d/wireguard
 wireguard-server.conf:/usr/local/etc/wireguard/wg[OPNsense.wireguard.server.servers.server.%.instance].conf
diff --git a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/opnsense-wireguard b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard
similarity index 68%
rename from net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/opnsense-wireguard
rename to net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard
index 86163acb6..e8fc8f634 100644
--- a/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/opnsense-wireguard
+++ b/net/wireguard/src/opnsense/service/templates/OPNsense/Wireguard/wireguard
@@ -1,6 +1,6 @@
 {% if helpers.exists('OPNsense.wireguard.general.enabled') and OPNsense.wireguard.general.enabled == '1' %}
-opnsense_wireguard_var_script="/usr/local/opnsense/scripts/OPNsense/Wireguard/setup.sh"
-opnsense_wireguard_enable="YES"
+wireguard_var_script="/usr/local/opnsense/scripts/OPNsense/Wireguard/setup.sh"
+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 @@ opnsense_wireguard_enable="YES"
 {%       endif %}
 {%     endfor %}
 {%   endif %}
-opnsense_wireguard_config="{{ activeservers | join(' ') }}"
+wireguard_interfaces="{{ activeservers | join(' ') }}"
 {% else %}
-opnsense_wireguard_enable="NO"
+wireguard_enable="NO"
 {% endif %}