X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=sgo-demo.cfg;h=381f0046c46b1e6bd3e29b27d7786dea553458dc;hp=91815b7b7ba9c7ce51b9938527b9e2136a8d08d1;hb=ef04103340f9c2f2666ea3a12bf6420758f2da6d;hpb=4d2501f1daaf5a9fb382a1e54c58940ff602ae58

diff --git a/sgo-demo.cfg b/sgo-demo.cfg
index 91815b7..381f004 100644
--- a/sgo-demo.cfg
+++ b/sgo-demo.cfg
@@ -1,32 +1,41 @@
-# -- in  servers.d/chiark
+# -- in  config.d/chiark
 [chiark]
-network
-server
-relay
+vnetwork
+vaddr
+vrelay
 addrs
 # port
 # mtu
 # limits
 
-# -- in  servers.d/davenant
+# -- in  config.d/davenant
 [davenant]
-network
-server
-relay
-addrs
+vnetwork
+vaddr
+vrelay
 addrs
 # port
 # mtu
-# limits eg max_batch_down=65536
+# limits eg
+max_batch_down = 65536
 
 [192.0.2.4]
-# adjusts eg http_timeout = 15
+# adjusts eg
+http_timeout = 15
+# ^ applies to all servers
+
+[davenant 192.0.2.4]
+# adjusts eg
+max_batch_down = 32768
+
 
 # -- in   chiark:master.cfg
-[server]
+[SERVER]
 server = chiark
 
-# -- in   chiark:passwords.d/192.0.2.4
-# -- in   zealot:passwords.d/chiark
-[192.0.2.4]
-password sesame
+# -- in   secrets.d/chiark-zealot   (on zealot and chiark)
+[chiark 192.0.2.4]
+secret = sesame
+
+# zealot knows it's 192.0.2.4 because that's the only client
+# for which it has a secret