X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fhostlist%2Ftest_gnunet_daemon_hostlist_data.conf;h=74d16be89bd9654695a0ad44c68a07b3b67dc897;hb=1f09f4f7716db5939ec1c9a278b5661616dd72d6;hp=507ea0805221109e000178228100fa264346d0cd;hpb=3c82a48a3a22b65b5f0db85528c1979ac0c878ed;p=oweals%2Fgnunet.git

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
index 507ea0805..74d16be89 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_data.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
@@ -1,75 +1,29 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunet-hostlist/
-DEFAULTCONFIG = /etc/gnunetd.conf
-
-[hostlist]
-PORT = 23354
-# port for hostlist http server
-HTTPPORT = 28080
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-daemon-hostlist
-# consider having "-e" as default as well once implemented
-OPTIONS = -b
-SERVERS = http://gnunet.org:8080/
-# proxy for downloading hostlists
-HTTP-PROXY = 
-
-[resolver]
-PORT = 12964
-
-[transport]
-PORT = 12965
-PLUGINS = tcp
-#DEBUG = YES
-DEBUG = NO
+@INLINE@ test_hostlist_defaults.conf
+[transport-tcp]
+PORT = 12968
 
 [arm]
 PORT = 12966
 DEFAULTSERVICES = hostlist topology
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
 
 [statistics]
 PORT = 12967
 
-[transport-tcp]
-PORT = 12968
-DEBUG = NO
+[resolver]
+PORT = 12964
 
 [peerinfo]
 PORT = 12969
 
+[transport]
+PORT = 12965
+
 [core]
 PORT = 12970
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck\
-DEBUG = NO
-
-[testing]
-WEAKRANDOM = YES
-
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-DEBUG = NO
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-[mesh]
-AUTOSTART = NO
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
 
+[hostlist]
+HTTPPORT = 28080
+SERVERS = http://gnunet.org:8080/
+PORT = 23354
+HOSTNAME = localhost