Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / dht / test_dht_line.conf

diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index e2bb54f1b90c530f4269f531441712fe8f1a5071..8e48b1165e323ba16e73d68884bd6c319ada5d0a 100644 (file)
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -1,15 +1,20 @@
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [PATHS]
-SERVICEHOME = /tmp/test_dht_line/
+GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/
 
-[arm]
-DEFAULTSERVICES = core dht
+[dht]
+START_ON_DEMAND = YES
+FORCESTART = YES
 
-[dns]
-AUTOSTART = NO
+[dhtcache]
+QUOTA = 1 MB
+DATABASE = heap
 
 [nat]
-DISABLEV6 = YES 
+DISABLEV6 = YES
 RETURN_LOCAL_ADDRESSES = YES
+USE_LOCALADDR = YES
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
@@ -20,21 +25,14 @@ EXTERNAL_ADDRESS = 127.0.0.1
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[testing]
-WEAKRANDOM = YES
-
 [testbed]
 OVERLAY_TOPOLOGY = LINE
 
-[namestore]
-AUTOSTART = NO
+[transport]
+plugins = unix
 
 [nse]
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
-
-[vpn]
-AUTOSTART = NO
-
-