$FreeBSD$

--- client/heartbeat.conf.orig	Sun Oct 26 14:43:39 2003
+++ client/heartbeat.conf	Thu May 13 13:19:32 2004
@@ -12,11 +12,12 @@
 # os 'linux'
 
 # Operating System (linux/freebsd/openbsd/netbsd/winxp)
-os "linux"
+# Use "freebsd" for FreeBSD 4.x, "netbsd" (sic) for FreeBSD 5.x
+os "%%GIFCONFIG%%"
 
 # Interface the tunnel should go over
 # used for detecting the local IPv4 endpoint
-ipv4_interface "eth0"
+ipv4_interface "tun0"
 
 # IPv4 address of the POP (nlams01/nlams02/nlams04/demun01/iedub01/dkcop01)
 # This is also the address to where heartbeats are sent
@@ -39,7 +40,7 @@
 
 # Interface to be used for the tunnel
 # will be created on the OS's that need that
-ipv6_interface "sixxs"
+ipv6_interface "gif0"
 
 # The local and remote sides of the tunnel
 ipv6_pop "2001:db8::1"