X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/d3731285e1e3638e7f4877c78ed9e27e1fd72233..fb78e73aa6726c6f1c76bdd0a20b42f0eebb22de:/peerdb/peers.in

diff --git a/peerdb/peers.in b/peerdb/peers.in
index 53eef5b2..25a14428 100644
--- a/peerdb/peers.in
+++ b/peerdb/peers.in
@@ -34,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.
 ;;;
@@ -68,13 +58,31 @@ host = override-me
 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.
 ;;;
 ;;; The parameters here affect peers to whom dynamic connections are made.
 ;;; 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.
@@ -94,8 +102,8 @@ disconnect = ssh -q $(ssh-user)@$[$(host)] goodbye
 ;; 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.
@@ -105,7 +113,7 @@ watch = t
 ;;; of the parameters and these defaults are probably pretty good.
 
 [@PASSIVE]
-@inherit = @GLOBAL
+@inherit = @WATCH
 
 ;; peer: mark this entry as being a passive peer.
 peer = PASSIVE
@@ -118,7 +126,8 @@ mobile = t
 ;; 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 --------------------------------------------------