WiP

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

diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index a4e8be65ea180775f9fc8ed6e1bc0d1b8ed65287..08d21662ac9e752f92dc185cc3f227d2439ec506 100644 (file)
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -1,27 +1,18 @@
 [fs]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-fs
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2094
-INDEXDB = $SERVICEHOME/idxinfo.lst
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = YES
 
 [dht]
-DEBUG = YES
+DEBUG = NO
 AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-dht
-#BINARY = gnunet-service-dht-new
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dht/.libs/gnunet-service-dht-new
 #PREFIX = xterm -T dht -e gdb --args
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 2100
-DISABLE_SOCKET_FORWARDING = YES
+PUT_PEER_IDENTITIES = YES
+
+[block]
+plugins = test dht dns
 
 [dhtcache]
 QUOTA = 1000000
@@ -30,36 +21,19 @@ DATABASE = sqlite
 [transport]
 PLUGINS = tcp
 DEBUG = NO
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12365
 
 [core]
 TOTAL_QUOTA_OUT = 3932160
 TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core dht
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
+DEFAULTSERVICES = core
 PORT = 12366
-DEBUG = YES
+DEBUG = NO
 
 [transport-tcp]
 TIMEOUT = 300000
@@ -68,6 +42,7 @@ PORT = 12368
 [TESTING]
 WEAKRANDOM = YES
 NUM_PEERS = 2
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey