friend is a reserved work in C++. Rename to friend_id.

[oweals/gnunet.git] / src / topology / test_gnunet_daemon_topology_data.conf

diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index d98dc9de731dcb3cf7e27138b79f6c75be6d2bc3..79f12e5e10b842ba4ee825114b1ebaaa53306050 100644 (file)
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-topology/
+GNUNET_TEST_HOME = /tmp/test-gnunet-topology/
 
 [resolver]
 PORT = 2664
@@ -7,7 +7,6 @@ PORT = 2664
 [transport]
 PORT = 2665
 PLUGINS = tcp
-#DEBUG = YES
 #PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
 #PREFIX = valgrind --tool=memcheck --log-file=logs%p
 
@@ -15,6 +14,9 @@ PLUGINS = tcp
 PORT = 2666
 DEFAULTSERVICES = topology
 
+[testbed]
+OVERLAY_TOPOLOGY=LINE
+
 [statistics]
 PORT = 2667
 
@@ -37,10 +39,8 @@ PORT = 2669
 
 [core]
 PORT = 2670
-#DEBUG = YES
 
 [topology]
-# DEBUG = YES
 #PREFIX = valgrind --tool=memcheck
 
 [fs]
@@ -53,7 +53,7 @@ AUTOSTART = NO
 WEAKRANDOM = YES
 
 [testing_old]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [dns]
 AUTOSTART = NO
@@ -64,4 +64,6 @@ AUTOSTART = NO
 [nse]
 AUTOSTART = NO
 
+[consensus]
+AUTOSTART = NO