From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 17 Jul 2018 14:01:46 +0000 (+0200)
Subject: openvpn: increase procd termination timeout to 15s
X-Git-Tag: v19.07.0-rc1~3135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28d3a1b54b6726a0a93477d75d09a25f74ee361f;p=thirdparty%2Fopenwrt.git

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>
---

diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile
index f532a1312d7..51ae9a38403 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 ab4f7dba0d4..7e6cfd9c351 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