X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/6005ef9bfba49124a25825a5b044d4f4cbf02792..9867bea0e9719d3e66b9b1504c728579a9a6b39c:/peerdb/peers.in

diff --git a/peerdb/peers.in b/peerdb/peers.in
index 16acbc8e..b1701574 100644
--- a/peerdb/peers.in
+++ b/peerdb/peers.in
@@ -2,8 +2,9 @@
 ;;;
 ;;; Peers description file
 ;;;
-;;; You're best off not editing this file at all; instead, drop a file
-;;; containing your overriden settings alongside.
+;;; New installations will clobber this file.  Therefore you're best off not
+;;; editing this file directly; instead, drop a file containing your
+;;; overridden settings alongside.
 
 ;;;--------------------------------------------------------------------------
 ;;; Global defaults.
@@ -33,16 +34,6 @@ ifname = vpn-$(name)
 ;; script is good for Linux hosts.
 ifup = /usr/sbin/tripe-ifup
 
-;; every: interval for checking that this connection is alive.
-every = 2m
-
-;; timeout: how long to wait for a ping response before giving up.
-timeout = 10s
-
-;; retries: how many ping attempts to make before declaring the connection
-;; dead.
-retries = 5
-
 ;;;--------------------------------------------------------------------------
 ;;; Active-peers defaults.
 ;;;
@@ -66,6 +57,24 @@ host = override-me
 ;; the remote peer.
 peer = INET $[$(host)] $(port)
 
+;;;--------------------------------------------------------------------------
+;;; Temporary association defaults.
+;;;
+;;; These are settings common to both dynamic and passive peers.
+
+[@WATCH]
+@inherit = @GLOBAL
+
+;; watch: whether to watch this connection and drop it if it dies.
+watch = t
+
+;; timeout: how long to wait for a ping response before giving up.
+timeout = 10s
+
+;; retries: how many ping attempts to make before declaring the connection
+;; dead.
+retries = 5
+
 ;;;--------------------------------------------------------------------------
 ;;; Dynamic-peers defaults.
 ;;;
@@ -73,7 +82,7 @@ peer = INET $[$(host)] $(port)
 ;;; The user and connect parameters probably need customizing.
 
 [@DYNAMIC]
-@inherit = @ACTIVE
+@inherit = @ACTIVE, @WATCH
 
 ;; cork: whether to wait for a key-exchange packet from the peer before
 ;; sending one of our own.
@@ -84,14 +93,17 @@ ssh-user = tripe
 
 ;; connect: shell command to use to wake up the remote peer and establish the
 ;; connection.
-connect = ssh -q $(ssh-user)@$[$(host)]
+connect = ssh -q $(ssh-user)@$[$(host)] hello
+
+;; disconnect: shell command to use to shut the remote peer down.
+disconnect = ssh -q $(ssh-user)@$[$(host)] goodbye
 
 ;; keepalive: how often to send NOP packets to keep the connection alive, at
 ;; least in the minds of intermediate stateful firewalls and NAT routers.
 keepalive = 2m
 
-;; watch: whether to watch this connection and retry it if it drops.
-watch = t
+;; every: interval for checking that this connection is alive.
+every = 30s
 
 ;;;--------------------------------------------------------------------------
 ;;; Passive-peers defaults.
@@ -101,16 +113,21 @@ watch = t
 ;;; of the parameters and these defaults are probably pretty good.
 
 [@PASSIVE]
-@inherit = @GLOBAL
+@inherit = @GLOBAL, @WATCH
 
 ;; peer: mark this entry as being a passive peer.
 peer = PASSIVE
 
+;; mobile: mark this peer as likely to change its external address without
+;; warning.
+mobile = t
+
 ;; user: the string which the dynamic peer's connect command will present to
 ;; the CONNECT service.
 user = $(name)
 
-;; watch: whether to watch this connection and drop it if it dies.
-watch = t
+;; every: interval for checking that this connection is alive: should be at
+;; least twice as long as the dynamic peer interval.
+every = 5m
 
 ;;;----- That's all, folks --------------------------------------------------