X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=ipif%2Fudptunnel-vpn-defaults;h=520359e1bfa62e23dcb3ae723be5ee60e4b8a2cd;hb=5f3e811b5415dcff74f82bdd2f26d3af1f73c555;hp=39f96a882f270a74afeaca9361ea6968204e70d7;hpb=ccd5607ec6a69b494932e46fa87953b37d302db7;p=userv-utils.git

diff --git a/ipif/udptunnel-vpn-defaults b/ipif/udptunnel-vpn-defaults
index 39f96a8..520359e 100644
--- a/ipif/udptunnel-vpn-defaults
+++ b/ipif/udptunnel-vpn-defaults
@@ -1,5 +1,8 @@
 m4_dnl udptunnel-vpn-defaults: default settings for udptunnel-reconf
 
+m4_dnl Copyright (C) 1999-2000,2003 Ian Jackson
+m4_dnl This file is part of ipif, part of userv-utils
+
 m4_dnl This is free software; you can redistribute it and/or modify it
 m4_dnl under the terms of the GNU General Public License as published by
 m4_dnl the Free Software Foundation; either version 2 of the License, or
@@ -17,8 +20,9 @@ m4_dnl
 m4_dnl $Id$
 
 SET(	lcommand,	[udptunnel])
+SET(	clock_maxskew,	45)
 SET( crypto,
-	[-e nonce -e timestamp/10/30 -e pkcs5/8 \
+	[-e nonce -e timestamp/V_clock_maxskew/V_clock_maxskew -e pkcs5/8 \
 	-e blowfish-cbcmac/128 -e blowfish-cbc/128])
 
 SET(	lpublic,	[`hostname`])
@@ -28,7 +32,7 @@ SET(	rport,		[Command])
 m4_dnl	lend		-- usually set in global
 m4_dnl	rend		-- usually set in sites
 SET(	mtu,		[1000])
-SET(	proto,		[cslip])
+SET(	proto,		[slip])
 SET(	to_restart,	[10])
 SET(	to_poll,	[30])
 SET(	to_quit,	[130])
@@ -49,7 +53,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])
@@ -75,7 +80,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])
 
@@ -104,7 +109,5 @@ SET(	command,
 	V_timeouts \
 	V_rnets \
 	V_lnets \
-	V_ssh \
-		V_ruser@V_sshdest \
-		V_rcommand
+	V_sshinvoke V_rcommand
 	])