-simplify

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

diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index c41ec6ae771b48154550cc532886efee8ab0067d..f70fbda5fe4b0b617c6c470ef8709a45dc3223a4 100644 (file)
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -1,47 +1,38 @@
+@INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-3/
-DEFAULTCONFIG = test_learning_learn_peer2.conf
-[resolver]
-PORT = 32964
+SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
 
-[transport]
-PORT = 32965
-PLUGINS = tcp
-#DEBUG = YES
+[transport-tcp]
+PORT = 32968
 
 [arm]
 PORT = 32966
-DEFAULTSERVICES = resolver transport core statistics topology hostlist
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
-DEBUG=NO
+DEFAULTSERVICES = topology hostlist
+UNIXPATH = /tmp/gnunet-p3-service-arm.sock
 
 [statistics]
 PORT = 32967
+UNIXPATH = /tmp/gnunet-p3-service-statistics.sock
 
-[transport-tcp]
-PORT = 32968
+[resolver]
+PORT = 32964
+UNIXPATH = /tmp/gnunet-p3-service-resolver.sock
 
 [peerinfo]
 PORT = 32969
+UNIXPATH = /tmp/gnunet-p3-service-peerinfo.sock
+
+[transport]
+PORT = 32965
+UNIXPATH = /tmp/gnunet-p3-service-transport.sock
 
 [core]
 PORT = 32970
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[testing]
-WEAKRANDOM = YES
+UNIXPATH = /tmp/gnunet-p3-service-core.sock
 
 [hostlist]
 HTTPPORT = 32980
-SERVERS = http://localhost:12981/
-OPTIONS = -b -e
-#OPTIONS = -b -p
-#DEBUG = YES
 HOSTLISTFILE = hostlists_learn_peer2.file
-#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
-
+OPTIONS = -b -e
+SERVERS = http://localhost:12981/
 
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck