-simplify

[oweals/gnunet.git] / src / hostlist / test_gnunet_daemon_hostlist_peer2.conf

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index fdedf6e38bd57e20b21c463dcdcb10f98c47fa27..c3833381a9c3b232930e72d44bfd644cc588e736 100644 (file)
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -1,67 +1,42 @@
+@INLINE@ test_hostlist_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
-DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf
 
-[resolver]
-PORT = 22964
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-DEBUG = NO
-
-[transport]
-PORT = 22965
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-PLUGINS = tcp
-DEBUG = NO
+[transport-tcp]
+PORT = 22968
 
 [arm]
 PORT = 22966
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 DEFAULTSERVICES = hostlist topology
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
-DEBUG = NO
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 22967
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
-[transport-tcp]
-PORT = 22968
-DEBUG = NO
+[resolver]
+PORT = 22964
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 22969
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
+[transport]
+PORT = 22965
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+
 [core]
 PORT = 22970
 UNIXPATH = /tmp/gnunet-p2-service-core.sock
-DEBUG = NO
-#PREFIX = valgrind --tool=memcheck
-
-[testing]
-WEAKRANDOM = YES
 
 [hostlist]
 HTTPPORT = 12981
-SERVERS = http://localhost:12980/
-OPTIONS = -b -p
-DEBUG = NO
 HOSTLISTFILE = hostlists_peer2.file
-#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
-
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-DEBUG = NO
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO[mesh]
-AUTOSTART = NO
+OPTIONS = -b -p
+SERVERS = http://localhost:12980/
 
+[ats]
+PORT = 22971
+UNIXPATH = /tmp/gnunet-p2-service-ats.sock