From f9cbc90c35946f8ffd43b790f738ddb39a4f0898 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 6 Sep 2022 08:53:52 +0200 Subject: [PATCH] security/softether: move to NAME_setup PR: https://github.com/opnsense/core/issues/5917 --- security/softether/Makefile | 2 +- .../opnsense/service/conf/actions.d/actions_softether.conf | 6 +++--- .../service/templates/OPNsense/Softether/softether_server | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/security/softether/Makefile b/security/softether/Makefile index c59549955..e7cc86d2e 100644 --- a/security/softether/Makefile +++ b/security/softether/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= softether -PLUGIN_VERSION= 0.2 +PLUGIN_VERSION= 0.3 PLUGIN_COMMENT= Cross-platform Multi-protocol VPN Program PLUGIN_DEPENDS= softether PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/security/softether/src/opnsense/service/conf/actions.d/actions_softether.conf b/security/softether/src/opnsense/service/conf/actions.d/actions_softether.conf index 2470ac33f..6e840fd06 100644 --- a/security/softether/src/opnsense/service/conf/actions.d/actions_softether.conf +++ b/security/softether/src/opnsense/service/conf/actions.d/actions_softether.conf @@ -1,5 +1,5 @@ [start] -command:/usr/local/opnsense/scripts/OPNsense/Softether/setup.sh;/usr/local/etc/rc.d/softether_server start +command:/usr/local/etc/rc.d/softether_server start parameters: type:script message:starting softether @@ -11,13 +11,13 @@ type:script message:stopping softether [restart] -command:/usr/local/opnsense/scripts/OPNsense/Softether/setup.sh;/usr/local/etc/rc.d/softether_server restart +command:/usr/local/etc/rc.d/softether_server restart parameters: type:script message:restarting softether [status] -command:sh /usr/local/etc/rc.d/softether_server status;exit 0 +command:/usr/local/etc/rc.d/softether_server status; exit 0 parameters: type:script_output message:softether status diff --git a/security/softether/src/opnsense/service/templates/OPNsense/Softether/softether_server b/security/softether/src/opnsense/service/templates/OPNsense/Softether/softether_server index 29fcf7190..be34375d5 100644 --- a/security/softether/src/opnsense/service/templates/OPNsense/Softether/softether_server +++ b/security/softether/src/opnsense/service/templates/OPNsense/Softether/softether_server @@ -1,5 +1,5 @@ {% if helpers.exists('OPNsense.softether.general.enabled') and OPNsense.softether.general.enabled == '1' %} -softether_server_var_script="/usr/local/opnsense/scripts/OPNsense/Softether/setup.sh" +softether_server_setup="/usr/local/opnsense/scripts/OPNsense/Softether/setup.sh" softether_server_enable="YES" {% if helpers.exists('OPNsense.softether.general.enablecarp') and OPNsense.softether.general.enablecarp == '1' %} required_files="/var/run/softether/CARP_MASTER"