Make gnurl and curl mutually exclusive.

[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 929215cc543ba7aaa7e550277d910d41be22dd14..9bee93e02574e1ee6fd51083b212a581356425f4 100644 (file)
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -1,5 +1,5 @@
 [PATHS]
-GNUNET_TEST_HOME = /tmp/gnunet-test-vpn/
+GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-vpn/
 
 [transport]
 PLUGINS = tcp
@@ -9,14 +9,20 @@ PORT = 0
 ALLOW_SHUTDOWN = YES
 
 [exit]
+IMMEDIATE_START = 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
 
 [hostlist]
-AUTOSTART = NO
+START_ON_DEMAND = NO
+IMMEDIATE_START = NO
 
 [nse]
 WORKBITS = 1
@@ -30,18 +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
+START_ON_DEMAND = NO
 
 [nat]
 USE_LOCALADDR = YES
 RETURN_LOCAL_ADDRESSES = YES
 
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO