RECLAIM/OIDC: code cleanup

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

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 1228a98e8c6874dad153e5697547234056631683..00c57c1e5659bae0232316c05a0cfdcbce29b777 100644 (file)
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -1,29 +1,44 @@
+@INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-1/
-DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-hostlist-peer-1/
 
-[resolver]
-PORT = 12964
-
-[transport]
-PORT = 12965
-PLUGINS = tcp
-#DEBUG = YES
+[transport-tcp]
+PORT = 12968
 
 [arm]
 PORT = 12966
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12967
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
-[transport-tcp]
-PORT = 12968
+[resolver]
+PORT = 12964
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12969
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
+
+[transport]
+PORT = 12965
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 [core]
 PORT = 12970
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock
+
+[hostlist]
+HTTPPORT = 12980
+HOSTLISTFILE = hostlists_peer1.file
+OPTIONS = -b -p
+SERVERS = http://localhost:22981/
+IMMEDIATE_START = YES
+
+[ats]
+PORT = 12971
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
-[testing]
-WEAKRANDOM = YES
+[topology]
+IMMEDIATE_START = YES