-no set autostarting

[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 e871c609cd3efe374ac36db72c5d15940a432508..afe3ef69a5de032735a05ac754979d9baa72bc4f 100644 (file)
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -1,65 +1,45 @@
+@INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-1/
-DEFAULTCONFIG = test_learning_learn_peer.conf
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/
 
-[resolver]
-PORT = 12964
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-
-[transport]
-PORT = 12965
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-PLUGINS = tcp
-#DEBUG = YES
+[transport-tcp]
+PORT = 12968
 
 [arm]
 PORT = 12966
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 DEFAULTSERVICES = topology hostlist
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
-#DEBUG=YES
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-arm.sock
 
 [statistics]
 PORT = 12967
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-HOSTNAME = localhost
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-statistics.sock
 
-[transport-tcp]
-PORT = 12968
+[resolver]
+PORT = 12964
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12969
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-peerinfo.sock
 
+[transport]
+PORT = 12965
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-transport.sock
 
 [core]
 PORT = 12970
-UNIXPATH = /tmp/gnunet-p2-service-core.sock
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[testing]
-WEAKRANDOM = YES
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-core.sock
 
 [hostlist]
 HTTPPORT = 12980
-SERVERS = http://localhost:12981/
-OPTIONS = -b -e
-#OPTIONS = -b -p
-#DEBUG = YES
 HOSTLISTFILE = hostlists_learn_peer.file
-#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
-
-
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
+OPTIONS = -b -e
+SERVERS = http://localhost:12981/
 
-[fs]
+[dht]
 AUTOSTART = NO
 
-[datastore]
-AUTOSTART = NO
 
-[dht]
-AUTOSTART = NO
+[ats]
+PORT = 12971
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-ats-p1-service-core.sock