-docu, style fixes

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

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index 167d3acbda5734cf4c38f3db8d8faccd41c14608..91df6a65d2e2f605f498633013438b9263366cde 100644 (file)
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -1,42 +1,44 @@
+@INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-2/
-DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-2/
 
-[resolver]
-PORT = 22964
-
-[transport]
-PORT = 22965
-PLUGINS = tcp
-#DEBUG = YES
+[transport-tcp]
+PORT = 22968
 
 [arm]
 PORT = 22966
-DEFAULTSERVICES = resolver transport core statistics topology
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 22967
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
-[transport-tcp]
-PORT = 22968
+[resolver]
+PORT = 22964
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 22969
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
+
+[transport]
+PORT = 22965
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [core]
 PORT = 22970
-DEBUG = YES
-#PREFIX = xterm -e xterm -e valgrind --tool=memcheck
-
-[testing]
-WEAKRANDOM = YES
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-core.sock
 
 [hostlist]
-HTTPPORT = 12981
-SERVERS = http://localhost:12980/
+HTTPPORT = 22981
+HOSTLISTFILE = hostlists_peer2.file
 OPTIONS = -b -p
-#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
+SERVERS = http://localhost:12980/
+FORCESTART = YES
+
+[ats]
+PORT = 22971
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 
 [topology]
-DEBUG = YES
\ No newline at end of file
+FORCESTART = YES