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-07-17 16:03:56 +0200
commit28d3a1b54b6726a0a93477d75d09a25f74ee361f (patch)
treeb75c0aa5154d12f355a5e4c59d2d6b661929dfc1
parent8194f9ef4a5ab4587e8f6cf1aec96ba89c5766fd (diff)
downloadupstream-28d3a1b54b6726a0a93477d75d09a25f74ee361f.tar.gz
upstream-28d3a1b54b6726a0a93477d75d09a25f74ee361f.tar.bz2
upstream-28d3a1b54b6726a0a93477d75d09a25f74ee361f.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>
-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 f532a1312d..51ae9a3840 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:=5
+PKG_RELEASE:=6
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