- merge; service API change

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

diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index c96a085075b12a8a80f702736121f94b50f51297..ed0dece5843f293f0fe2336e33dea07f4bf56585 100644 (file)
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.conf
@@ -1,11 +1,6 @@
-[fs]
-AUTOSTART = NO
+@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
 
-[resolver]
-AUTOSTART = NO
-
-[block]
-plugins = test dht
 
 [dhtcache]
 QUOTA = 1 MB
@@ -18,20 +13,11 @@ PLUGINS = tcp
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[arm]
-DEFAULTSERVICES = dht core
-
-[TESTING]
-WEAKRANDOM = YES
-
 [testbed]
 OVERLAY_TOPOLOGY = LINE
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
 [PATHS]
-SERVICEHOME = /tmp/test-dht-multipeer/
+GNUNET_TEST_HOME = /tmp/test-dht-monitor/
 
 [nat]
 DISABLEV6 = YES
@@ -43,15 +29,11 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = YES
 RETURN_LOCAL_ADDRESSES = YES
 
-[dns]
-AUTOSTART = NO
 
-[namestore]
-AUTOSTART = NO
+[dht]
+AUTOSTART = YES
+FORCESTART = YES
 
 [nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO
-
+AUTOSTART = YES
+WORKBITS = 1