-no set autostarting

[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 b281802ca8e92db54fc7989f2f207303fe1360f5..dc27bfb9aaf40759d46a56b1545f6759b3141606 100644 (file)
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -1,59 +1,38 @@
+@INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
-DEFAULTCONFIG = test_learning_learn_peer2.conf
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-3/
 
-[resolver]
-PORT = 32964
-UNIXPATH = /tmp/gnunet-p3-service-resolver.sock
-
-[transport]
-PORT = 32965
-UNIXPATH = /tmp/gnunet-p3-service-transport.sock
-PLUGINS = tcp
-#DEBUG = YES
+[transport-tcp]
+PORT = 32968
 
 [arm]
 PORT = 32966
-UNIXPATH = /tmp/gnunet-p3-service-arm.sock
 DEFAULTSERVICES = topology hostlist
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
-DEBUG=NO
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-arm.sock
 
 [statistics]
 PORT = 32967
-UNIXPATH = /tmp/gnunet-p3-service-statistics.sock
-HOSTNAME = localhost
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-statistics.sock
 
-[transport-tcp]
-PORT = 32968
+[resolver]
+PORT = 32964
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-resolver.sock
 
 [peerinfo]
 PORT = 32969
-UNIXPATH = /tmp/gnunet-p3-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-peerinfo.sock
+
+[transport]
+PORT = 32965
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-transport.sock
 
 [core]
 PORT = 32970
-UNIXPATH = /tmp/gnunet-p3-service-core.sock
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[testing]
-WEAKRANDOM = YES
+UNIXPATH = $GNUNET_RUNTIME_DIR/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
-
-
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-[mesh]
-AUTOSTART = NO
-
+OPTIONS = -b -e
+SERVERS = http://localhost:12981/