config: better examples/docs (update to how things are now)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/README.config b/README.config
index 04d94caaeacddd5719eb143e73e29ba543126f6f..9c0e4fefed935e22779154b27330abf33af43322 100644 (file)
--- a/README.config
+++ b/README.config
@@ -4,7 +4,7 @@ Sections
 
   [<servername> - <client>]
   [<client>]
 
   [<servername> - <client>]
   [<client>]

-  [<servername>]      usually [SERVER]
+  [<servername>]      often [SERVER]

   [DEFAULT]
 
 Keys are looked up in that order, unless otherwise specified.
   [DEFAULT]
 
 Keys are looked up in that order, unless otherwise specified.

diff --git a/sgo-demo.cfg b/sgo-demo.cfg
index e7d369fad6ef69900b1fe3864139c518ab200afa..7dca241a7de5ce3ca91d61b17f54a18801aef766 100644 (file)
--- a/sgo-demo.cfg
+++ b/sgo-demo.cfg
@@ -1,19 +1,18 @@
-# -- in  servers.d/chiark
+# -- in  config.d/chiark

 [chiark]
 [chiark]

-network
-server
-relay
+vnetwork
+vaddr
+vrelay

 addrs
 # port
 # mtu
 # limits
 
 addrs
 # port
 # mtu
 # limits
 

-# -- in  servers.d/davenant
+# -- in  config.d/davenant

 [davenant]
 [davenant]

-network
-server
-relay
-addrs
+vnetwork
+vaddr
+vrelay

 addrs
 # port
 # mtu
 addrs
 # port
 # mtu

diff --git a/simple.cfg b/simple.cfg
index 854f20eb4b12153fb7f74913151318b080e4d717..3348e8e1c0c1b96f9110421328beba7d6581f01b 100644 (file)
--- a/simple.cfg
+++ b/simple.cfg
@@ -1,5 +1,7 @@
+# -- in  master.cfg (on both client and server)

 [SERVER]
 addrs = 203.0.113.46
 
 [SERVER]
 addrs = 203.0.113.46
 

+# -- in  passwords.d/password (on both client and server)

 [172.24.230.195]
 password = sesame
 [172.24.230.195]
 password = sesame