Import release 0.1.14

[secnet.git] / example.conf

diff --git a/example.conf b/example.conf
index 49f2540f571145c16714c641e07c4bfc6327bc05..634467c9e6c12a3279daa40617c52dc50367bca5 100644 (file)
--- a/example.conf
+++ b/example.conf
@@ -1,22 +1,23 @@
 # secnet example configuration file
 
 # Log facility
-log syslog {
-       ident "secnet";
-       facility "local0";
+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
 };
 
-# 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
+# Alternatively you could log to syslog:
+# log syslog {
+#      ident "secnet";
+#      facility "local0";
 # };
 
+
 # Systemwide configuration (all other configuration is per-site):
 # log          a log facility for program messages
 # userid       who we try to run as after setup
@@ -64,19 +65,19 @@ 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 {
        name "netlink-tun"; # Printed in log messages from this netlink
 #      interface "tun0"; # You may set your own interface name if you wish;
                # if you don't one will be chosen for you.
 #      device "/dev/net/tun";
 
-       # local networks served by this netlink device
-       # incoming tunneled packets for other networks will be discarded
-       networks "192.168.x.x/24", "192.168.x.x/24", "172.x.x.x/24";
        local-address "192.168.x.x"; # IP address of host's tunnel interface
        secnet-address "192.168.x.x"; # IP address of this secnet
 
+       # Tunnels are only allowed to use these networks; attempts to
+       # claim IP addresses in any other ranges is a configuration error
+       remote-networks "192.168.0.0/16", "172.16.0.0/12", "10.0.0.0/8";
+
        # MTU of the tunnel interface. Should be kept under the path-MTU
        # (by at least 60 bytes) between this secnet and its peers for
        # optimum performance.
@@ -129,7 +130,7 @@ 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
+# If you're using the make-secnet-sites 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");
@@ -147,10 +148,10 @@ include /etc/secnet/sites.conf
 # a newer version. MAKE SURE YOU GET AN AUTHENTIC COPY OF THE FILE - it
 # contains public keys for all sites.
 
-sites
-       site(vpn-data/example/location1/site1),
-       site(vpn-data/example/location2/site1),
-       site(vpn-data/example/location2/site2);
+sites map(site,
+       vpn-data/example/location1/site1,
+       vpn-data/example/location2/site1,
+       vpn-data/example/location2/site2);
 
 # If you want to communicate with all the VPN sites, you can use something
 # like the following instead: