X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=example.conf;h=03e5f436bde0db63538dc81b782a04b2b962b008;hb=7138d0c54cd2212439434d27cb2d6ea775c3039b;hp=96a84339223e46e08602c4697a23efa0037707da;hpb=974d0468ad285d9ddbc5b052110076d7adf0ed2e;p=secnet.git

diff --git a/example.conf b/example.conf
index 96a8433..03e5f43 100644
--- a/example.conf
+++ b/example.conf
@@ -1,7 +1,21 @@
 # secnet example configuration file
 
 # Log facility
-log logfile("secnet","local2"); # Not yet implemented, goes to stderr
+log syslog {
+	ident "secnet";
+	facility "local0";
+};
+
+# Alternatively you could log to a file:
+# log logfile {
+# 	filename "/var/log/secnet";
+# 	class "info","notice","warning","error","security","fatal";
+# 	# There are some useful message classes that could replace
+# 	# this list:
+# 	#  'default' -> warning,error,security,fatal
+# 	#  'verbose' -> info,notice,default
+# 	#  'quiet'   -> fatal
+# };
 
 # Systemwide configuration (all other configuration is per-site):
 # log		a log facility for program messages
@@ -44,8 +58,10 @@ system {
 # setup-retries         max retransmits of a key setup packet
 # setup-timeout         wait between retransmits of key setup packets, in ms
 # wait-time             wait between unsuccessful key setup attempts, in ms
+# renegotiate-time      set up a new key if we see any traffic after this time
 
 # Use the universal TUN/TAP driver to get packets to and from the kernel
+#  (use tun-old if you are not on Linux-2.4)
 netlink tun {
 	name "netlink-tun"; # Printed in log messages from this netlink
 #	interface "tun0"; # You may set your own interface name if you wish;
@@ -102,7 +118,8 @@ resolver adns {
 };
 
 # log is defined earlier - we share it with the system
-log-events "init","up","down"; # XXX not yet used
+log-events "setup-init","setup-timeout","activate-key","timeout-key","errors",
+	"security";
 
 # A source of random bits for nonces and session keys. The 'no' specifies
 # that it's non-blocking. XXX 'yes' isn't implemented yet.
@@ -116,7 +133,7 @@ transform serpent256-cbc {
 	max-sequence-skew 10;
 };
 
-include /etc/secnet/sites
+include /etc/secnet/sites.conf
 
 # Here you must list all the VPN sites that you wish to communicate with.
 # The /etc/secnet/sites file contains information on all reachable sites;
@@ -124,9 +141,16 @@ include /etc/secnet/sites
 # a newer version. MAKE SURE YOU GET AN AUTHENTIC COPY OF THE FILE - it
 # contains public keys for all sites.
 
-# Do not include your own site in this list!
-
 sites
-	site(example-vpn/some-site),
-	site(example-vpn/some-other-site),
-	site(example-vpn/a-third-site);
+	site(vpn-data/example/location1/site1),
+	site(vpn-data/example/location2/site1),
+	site(vpn-data/example/location2/site2);
+
+# If you want to communicate with all the VPN sites, you can use something
+# like the following instead:
+
+# sites map(site,vpn/example/all-sites);
+
+# If you want to communicate with a subset of locations, try the following:
+
+# sites map(site,vpn/example/location1,vpn/example/location2);