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

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

diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 0e34eb747d6887a6d6589505473f74dc628ae059..de9196107a3b50b015f293a0fe5a78fe3e2df9d0 100644 (file)
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -1,18 +1,12 @@
-[PATHS]
-SERVICEHOME = /tmp/test-dht-api/
-DEFAULTCONFIG = test_dht_api_data.conf
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
+@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
 
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-dht-api/
 
-[datastore]
-AUTOSTART = NO
+[dhtcache]
+QUOTA = 1 MB
+DATABASE = heap
 
 [topology]
 TARGET-CONNECTION-COUNT = 16
@@ -24,46 +18,13 @@ MINIMUM-FRIENDS = 0
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[core]
-PORT = 2092
-
-[dht]
-DEBUG = NO
-PORT = 12370
-
-[block]
-plugins = dht test
-
 [transport]
 plugins = tcp
-DEBUG = NO
 NEIGHBOUR_LIMIT = 50
 PORT = 2091
 
-[peerinfo]
-PORT = 2090
-
-[resolver]
-PORT = 2089
-
-[statistics]
-PORT = 2088
-
-[arm]
-DEFAULTSERVICES = 
-PORT = 2087
-
 [transport-tcp]
 TIMEOUT = 300 s
-PORT = 2094
-
-[TESTING]
-WEAKRANDOM = NO
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
 
 [nat]
 DISABLEV6 = YES
@@ -74,12 +35,10 @@ ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
-[dns]
-AUTOSTART = NO
-
-
+[dht]
+AUTOSTART = YES
+FORCESTART = YES
 
 [nse]
-AUTOSTART = NO
-
-
+AUTOSTART = YES
+WORKBITS = 1