aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-07-17 16:01:46 +0200
committerJo-Philipp Wich <jo@mein.io>2018-12-18 09:47:39 +0100
commit0282d04a85b3c5232742e9084a165d1b5406a0af (patch)
treeb2a5ca49d0896f60ddb242d3105cce176fcb25d4
parentfa112bc46ac71255df0e71a8a468a3cffd63d3e0 (diff)
downloadupstream-0282d04a85b3c5232742e9084a165d1b5406a0af.tar.gz
upstream-0282d04a85b3c5232742e9084a165d1b5406a0af.tar.bz2
upstream-0282d04a85b3c5232742e9084a165d1b5406a0af.zip
openvpn: increase procd termination timeout to 15s
Increase the termination timeout to 15s to let OpenVPN properly tear down its connections, especially when weak links or complex down scripts are involved. Fixes FS#859. Signed-off-by: Jo-Philipp Wich <jo@mein.io> (backported from 28d3a1b54b6726a0a93477d75d09a25f74ee361f)
-rw-r--r--package/network/services/openvpn/Makefile2
-rw-r--r--package/network/services/openvpn/files/openvpn.init1
2 files changed, 2 insertions, 1 deletions
diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile
index ae49d4dc68..360ee56fa7 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn
PKG_VERSION:=2.4.5
-PKG_RELEASE:=4.1
+PKG_RELEASE:=4.2
PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \
diff --git a/package/network/services/openvpn/files/openvpn.init b/package/network/services/openvpn/files/openvpn.init
index ab4f7dba0d..7e6cfd9c35 100644
--- a/package/network/services/openvpn/files/openvpn.init
+++ b/package/network/services/openvpn/files/openvpn.init
@@ -67,6 +67,7 @@ openvpn_add_instance() {
--cd "$dir" \
--config "$conf"
procd_set_param file "$dir/$conf"
+ procd_set_param term_timeout 15
procd_set_param respawn
procd_append_param respawn 3600
procd_append_param respawn 5