X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/2e082dfed76851117cafd488388a010cac25df09..99d1b3be1fa96c22212b8940aa2e8607bad1803b:/ipif/udptunnel-vpn-defaults?ds=sidebyside

diff --git a/ipif/udptunnel-vpn-defaults b/ipif/udptunnel-vpn-defaults
index add96da..330273d 100644
--- a/ipif/udptunnel-vpn-defaults
+++ b/ipif/udptunnel-vpn-defaults
@@ -29,6 +29,7 @@ m4_dnl	lend		-- usually set in global
 m4_dnl	rend		-- usually set in sites
 SET(	mtu,		[1000])
 SET(	proto,		[cslip])
+SET(	to_restart,	[10])
 SET(	to_poll,	[30])
 SET(	to_quit,	[130])
 SET(	to_report,	[1800])
@@ -48,7 +49,8 @@ SET( ssh,
 	[ssh	V_sshstdopts \
 		V_sshprotoka V_sshverbose \
 		V_sshopts])
-
+SET( sshinvoke,		[V_ssh V_ruser@V_sshdest])
+		
 SET(	sshdest,	[V_rpublic])
 
 SET(	sites,		[sites])
@@ -74,7 +76,7 @@ SET(	syslog_priority,	info)
 SET(	inittab_runlevels,	2345)
 SET(	inittab_pfx,		[])
 SET(	inittab_sfx,
- [2>&1 | logger -p V_syslog_facility.V_syslog_priority -t tunnel-V_site])
+ [</dev/null 2>&1 | logger -p V_syslog_facility.V_syslog_priority -t tunnel-V_site])
 SET(	inittab_command,[V_inittab_pfx V_invoke_file V_inittab_sfx])
 SET(	inittab_line, 	[V_inittab_runlevels:respawn:V_inittab_command])
 
@@ -82,9 +84,13 @@ SET( invoke_body,
 [set -e
 V_invoke_hook
 echo "STARTING TUNNEL `date`" >&2
+set +e
 V_command
 rc=$?
+set -e
 echo "TUNNEL CLOSED rc=$rc" >&2
+sleep V_to_restart
+echo "TUNNEL MAYRESTART" >&2
 exit $rc
 ])
 
@@ -99,7 +105,5 @@ SET(	command,
 	V_timeouts \
 	V_rnets \
 	V_lnets \
-	V_ssh \
-		V_ruser@V_sshdest \
-		V_rcommand
+	V_sshinvoke V_rcommand
 	])