-@INLINE@ ../../contrib/no_forcestart.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
[PATHS]
-GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/
+GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/
[dht]
-AUTOSTART = YES
-FORCESTART = YES
+START_ON_DEMAND = YES
+IMMEDIATE_START = YES
[dhtcache]
QUOTA = 1 MB
OVERLAY_TOPOLOGY = 2D_TORUS
[nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
WORKDELAY = 500 ms
INTERVAL = 60 s
WORKBITS = 0