Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials

[oweals/gnunet.git] / src / pt / test_gnunet_vpn.conf

diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index bdac1a5b6822b8681743a7a31ccad47dca50d6c7..9c3c2654fbc7a121ae8118cb731876cd6d691d31 100644 (file)
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -1,25 +1,28 @@
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-vpn/
-DEFAULTCONFIG = test_gnunet_vpn.conf
+GNUNET_TEST_HOME = /tmp/gnunet-test-vpn/
 
 [transport]
 PLUGINS = tcp
 
 [arm]
-DEFAULTSERVICES = statistics exit vpn
 PORT = 0
 ALLOW_SHUTDOWN = YES
 
 [exit]
+FORCESTART = YES
 EXIT_IPV4 = YES
 EXIT_IPV6 = YES
+IPV6ADDR = FC5A:04E1:C2BA::1
+IPV6PREFIX = 96
+IPV4ADDR = 169.254.86.1
+IPV4MASK = 255.255.255.0
 
 # FIXME: can we use 'lo'?
 EXIT_IFNAME = eth1
 
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+[hostlist]
+AUTOSTART = NO
+FORCESTART = NO
 
 [nse]
 WORKBITS = 1
@@ -33,11 +36,13 @@ IPV6PREFIX = 64
 IPV4ADDR = 169.254.20.1
 IPV4MASK = 255.255.255.0
 
-[exit]
-IPV6ADDR = FC5A:04E1:C2BA::1
-IPV6PREFIX = 96
-IPV4ADDR = 169.254.86.1
-IPV4MASK = 255.255.255.0
 
 [gns]
 AUTOSTART = NO
+
+[nat]
+USE_LOCALADDR = YES
+RETURN_LOCAL_ADDRESSES = YES
+
+[consensus]
+AUTOSTART = NO