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 9c3c2654fbc7a121ae8118cb731876cd6d691d31..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,7 +9,7 @@ PORT = 0
 ALLOW_SHUTDOWN = YES
 
 [exit]
-FORCESTART = YES
+IMMEDIATE_START = YES
 EXIT_IPV4 = YES
 EXIT_IPV6 = YES
 IPV6ADDR = FC5A:04E1:C2BA::1
@@ -21,8 +21,8 @@ IPV4MASK = 255.255.255.0
 EXIT_IFNAME = eth1
 
 [hostlist]
-AUTOSTART = NO
-FORCESTART = NO
+START_ON_DEMAND = NO
+IMMEDIATE_START = NO
 
 [nse]
 WORKBITS = 1
@@ -38,11 +38,11 @@ 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