+@INLINE@ test_hostlist_defaults.conf
[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-2/
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/
-[resolver]
-PORT = 22964
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-
-[transport]
-PORT = 22965
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-PLUGINS = tcp
-#DEBUG = YES
+[transport-tcp]
+PORT = 22968
[arm]
PORT = 22966
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-DEFAULTSERVICES = topology hostlist
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args
-DEBUG=YES
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-arm.sock
[statistics]
PORT = 22967
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-HOSTNAME = localhost
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-statistics.sock
-[transport-tcp]
-PORT = 22968
+[resolver]
+PORT = 22964
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-resolver.sock
[peerinfo]
PORT = 22969
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-peerinfo.sock
+
+[transport]
+PORT = 22965
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-transport.sock
[core]
PORT = 22970
-UNIXPATH = /tmp/gnunet-p1-service-core.sock
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[testing]
-WEAKRANDOM = YES
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-core.sock
[hostlist]
-EXTERNAL_DNS_NAME = localhost
HTTPPORT = 12981
-SERVERS = http://localhost:12981/
-OPTIONS = -p -a
-#OPTIONS = -b -p -a
-#DEBUG = YES
HOSTLISTFILE = hostlists_adv_peer.file
-#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
-
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-
-[fs]
-AUTOSTART = NO
+OPTIONS = -p -a
+SERVERS = http://localhost:12981/
+EXTERNAL_DNS_NAME = localhost
+FORCESTART = YES
-[datastore]
-AUTOSTART = NO
+[ats]
+PORT = 22971
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-ats-p2-service-core.sock
-[dht]
-AUTOSTART = NO
+[topology]
+FORCESTART = YES