Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38331
-# Copyright (C) 2010-2012 OpenWrt.org
+# Copyright (C) 2010-2013 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
PKG_NAME:=openvpn
PKG_VERSION:=2.3.2
PKG_NAME:=openvpn
PKG_VERSION:=2.3.2
PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-# Copyright (C) 2008-2011 OpenWrt.org
+# Copyright (C) 2008-2013 OpenWrt.org
# Copyright (C) 2008 Jo-Philipp Wich
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
# Copyright (C) 2008 Jo-Philipp Wich
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
-EXTRA_COMMANDS="up down"
+USE_PROCD=1
+PROG=/usr/sbin/openvpn
*_*_*) v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
*_*) v=${v%%_*}-${v#*_} ;;
esac
*_*_*) v=${v%%_*}-${v#*_}; v=${v%%_*}-${v#*_} ;;
*_*) v=${v%%_*}-${v#*_} ;;
esac
+ procd_append_param command --"$v"
config_get v "$s" "$p"
IFS="$LIST_SEP"
for v in $v; do
config_get v "$s" "$p"
IFS="$LIST_SEP"
for v in $v; do
- [ -n "$v" ] && append_param "$p" && ARGS="$ARGS $v"
+ [ -n "$v" ] && append_param "$p" && procd_append_param command "$v"
+ procd_open_instance
+ procd_set_param command "$PROG" --syslog "openvpn($s)" --writepid "/var/run/openvpn-$s.pid"
+
# append flags
append_bools "$s" \
auth_nocache auth_retry auth_user_pass_optional bind ccd_exclusive client client_cert_not_required \
# append flags
append_bools "$s" \
auth_nocache auth_retry auth_user_pass_optional bind ccd_exclusive client client_cert_not_required \
tun_mtu tun_mtu_extra txqueuelen user verb down push up
tun_mtu tun_mtu_extra txqueuelen user verb down push up
- SERVICE_PID_FILE="/var/run/openvpn-$s.pid"
- service_start /usr/sbin/openvpn --syslog "openvpn($s)" --writepid "$SERVICE_PID_FILE" $ARGS
-}
-
-stop_instance() {
- local s="$1"
-
- section_enabled "$s" || return 1
-
- SERVICE_PID_FILE="/var/run/openvpn-$s.pid"
- service_stop /usr/sbin/openvpn
-}
-
-reload_instance() {
- local s="$1"
-
- section_enabled "$s" || return 1
-
- SERVICE_PID_FILE="/var/run/openvpn-$s.pid"
- service_reload /usr/sbin/openvpn
config_load 'openvpn'
config_foreach start_instance 'openvpn'
}
config_load 'openvpn'
config_foreach start_instance 'openvpn'
}
-
-stop() {
- config_load 'openvpn'
- config_foreach stop_instance 'openvpn'
-}
-
-reload() {
- config_load 'openvpn'
- config_foreach reload_instance 'openvpn'
-}
-
-up() {
- local exists
- local instance
- config_load 'openvpn'
- for instance in "$@"; do
- config_get exists "$instance" 'TYPE'
- if [ "$exists" == "openvpn" ]; then
- start_instance "$instance"
- fi
- done
-}
-
-down() {
- local exists
- local instance
- config_load 'openvpn'
- for instance in "$@"; do
- config_get exists "$instance" 'TYPE'
- if [ "$exists" == "openvpn" ]; then
- stop_instance "$instance"
- fi
- done
-}