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=e7d369fad6ef69900b1fe3864139c518ab200afa;hb=a14782d3bb7fe3e65f19e45d913d2e5f5d8662bb;hpb=c7fb640effd718bb66548327c4feddcc64416234

diff --git a/sgo-demo.cfg b/sgo-demo.cfg
index e7d369f..381f004 100644
--- a/sgo-demo.cfg
+++ b/sgo-demo.cfg
@@ -1,19 +1,18 @@
-# -- 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
@@ -34,9 +33,9 @@ max_batch_down = 32768
 [SERVER]
 server = chiark
 
-# -- in   passwords.d/chiark-zealot   (on zealot and chiark)
+# -- in   secrets.d/chiark-zealot   (on zealot and chiark)
 [chiark 192.0.2.4]
-password = sesame
+secret = sesame
 
 # zealot knows it's 192.0.2.4 because that's the only client
-# for which it has a password
+# for which it has a secret