- fix

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

diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index c2d02e1d36e57d4bc8ae0e55afd55874e04c61ee..0136d7706e091515c4ac465f5d74b0412c52cee3 100644 (file)
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -1,63 +1,46 @@
+@INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-hostlist-peer-1/
+SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
 DEFAULTCONFIG = test_learning_learn_peer.conf
 
-[resolver]
-PORT = 12964
-UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock
-
-[transport]
-PORT = 12965
-UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock
-PLUGINS = tcp
-#DEBUG = YES
+[transport-tcp]
+PORT = 12968
 
 [arm]
 PORT = 12966
-UNIXPATH = /tmp/gnunet-hostlist-p1-service-arm.sock
 DEFAULTSERVICES = topology hostlist
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
-#DEBUG=YES
+UNIXPATH = /tmp/gnunet-hostlist-p1-service-arm.sock
 
 [statistics]
 PORT = 12967
 UNIXPATH = /tmp/gnunet-hostlist-p1-service-statistics.sock
-HOSTNAME = localhost
 
-[transport-tcp]
-PORT = 12968
+[resolver]
+PORT = 12964
+UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12969
 UNIXPATH = /tmp/gnunet-hostlist-p1-service-peerinfo.sock
 
+[transport]
+PORT = 12965
+UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock
 
 [core]
 PORT = 12970
 UNIXPATH = /tmp/gnunet-hostlist-p1-service-core.sock
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[testing]
-WEAKRANDOM = YES
 
 [hostlist]
 HTTPPORT = 12980
-SERVERS = http://localhost:12981/
-OPTIONS = -b -e
-#OPTIONS = -b -p
-#DEBUG = YES
 HOSTLISTFILE = hostlists_learn_peer.file
+OPTIONS = -b -e
+SERVERS = http://localhost:12981/
 
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[fs]
+[dht]
 AUTOSTART = NO
 
-[datastore]
-AUTOSTART = NO
 
-[dht]
-AUTOSTART = NO
+[ats]
+PORT = 12971
+UNIXPATH = /tmp/gnunet-ats-p1-service-core.sock