X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/9d3a4132788b198345116624761c12ed7bc936b6..c6f79b178fe27ee315055dccb371b63ca1a6183a:/example.conf

diff --git a/example.conf b/example.conf
index 3b4a32f..189b442 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
@@ -46,6 +60,9 @@ system {
 # 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
 
+setup-retries 10;
+setup-timeout 2000;
+
 # 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 {
@@ -111,6 +128,8 @@ log-events "setup-init","setup-timeout","activate-key","timeout-key","errors",
 # that it's non-blocking. XXX 'yes' isn't implemented yet.
 random randomfile("/dev/urandom",no);
 
+# If you're using the make-secnet-sites.py script then your local-name
+# will be of the form "vpnname/location/site" eg. "sgo/greenend/sinister"
 local-name "your-site-name";
 local-key rsa-private("/etc/secnet/key");
 
@@ -119,7 +138,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;
@@ -128,11 +147,15 @@ include /etc/secnet/sites
 # contains public keys for all sites.
 
 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,makelist(example-vpn));
+# 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);