NAMESTORE/JSON: fix parsing exp and flags

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

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
index 059f59831397d4d2c6a6ab0a3cdbbb01e4bf8369..9f853c244aaca57032bf9998f5b01b890b100e7a 100644 (file)
--- a/src/hostlist/test_gnunet_daemon_hostlist_data.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
@@ -1,62 +1,28 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunetd-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
+[hostlist]
+HTTPPORT = 28080
+SERVERS = http://gnunet.org:8080/
+PORT = 23354
+HOSTNAME = localhost