ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-23 07:22:33 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

openvpn: add support to start/stop single instances

Browse Source 
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> (PKG_RELEASE increase)
(cherry picked from commit e2f25e607d)
This commit is contained in:
Martin Schiller 2017-10-09 10:12:04 +02:00 committed by Jo-Philipp Wich
parent e5c284bb81
commit 91e48304a9
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/openvpn/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn PKG_NAME:=openvpn
PKG_VERSION:=2.4.4 PKG_VERSION:=2.4.4
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_URL:=\ PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \ https://build.openvpn.net/downloads/releases/ \

53
package/network/services/openvpn/files/openvpn.init
View File

@ -60,7 +60,7 @@ openvpn_add_instance() {
local dir="$2" local dir="$2"
local conf="$3" local conf="$3"
procd_open_instance procd_open_instance "$name"
procd_set_param command "$PROG" \ procd_set_param command "$PROG" \
--syslog "openvpn($name)" \ --syslog "openvpn($name)" \
--status "/var/run/openvpn.$name.status" \ --status "/var/run/openvpn.$name.status" \
@ -103,28 +103,47 @@ start_instance() {
} }
start_service() { start_service() {
local instance="$1"
local instance_found=0
config_cb() {
local type="$1"
local name="$2"
if [ "$type" = "openvpn" ]; then
if [ -n "$instance" -a "$instance" = "$name" ]; then
instance_found=1
fi
fi
}
. /usr/share/openvpn/openvpn.options . /usr/share/openvpn/openvpn.options
config_load 'openvpn' config_load 'openvpn'
config_foreach start_instance 'openvpn'
local path name if [ -n "$instance" ]; then
for path in /etc/openvpn/*.conf; do [ "$instance_found" -gt 0 ] || return
if [ -f "$path" ]; then start_instance "$instance"
name="${path##*/}"; name="${name%.conf}" else
config_foreach start_instance 'openvpn'
# don't start configs again that are already started by uci local path name
if echo "$UCI_STARTED" | grep -qxF "$path"; then for path in /etc/openvpn/*.conf; do
continue if [ -f "$path" ]; then
name="${path##*/}"; name="${name%.conf}"
# don't start configs which are set to disabled in uci # don't start configs again that are already started by uci
elif echo "$UCI_DISABLED" | grep -qxF "$path"; then if echo "$UCI_STARTED" | grep -qxF "$path"; then
logger -t openvpn "$name.conf is disabled in /etc/config/openvpn" continue
continue
# don't start configs which are set to disabled in uci
elif echo "$UCI_DISABLED" | grep -qxF "$path"; then
logger -t openvpn "$name.conf is disabled in /etc/config/openvpn"
continue
fi
openvpn_add_instance "$name" "${path%/*}" "$path"
fi fi
done
openvpn_add_instance "$name" "${path%/*}" "$path" fi
fi
done
} }
service_triggers() { service_triggers() {