-fix

[oweals/gnunet.git] / src / fs / fs_test_lib_data.conf

diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 00654c73d57ce78a745720ba136601362c4ad31f..c4e5083241598c073c23ce226a304263d4be0cf3 100644 (file)
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -1,74 +1,17 @@
+@INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-lib/
-DEFAULTCONFIG = fs_test_lib_data.conf
+GNUNET_TEST_HOME = /tmp/gnunet-fs-test-lib/
 
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 43464
-HOSTNAME = localhost
-
-[transport]
-PORT = 43465
-PLUGINS = tcp
-#DEBUG = YES
-
-[arm]
-PORT = 43466
-HOSTNAME = localhost
-DEFAULTSERVICES = fs
-#GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
+[ats]
+WAN_QUOTA_IN = 3932160
+WAN_QUOTA_OUT = 3932160
 
 [datastore]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-QUOTA = 2000000000
-
-[statistics]
-PORT = 43467
-HOSTNAME = localhost
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 43468
-
-[peerinfo]
-PORT = 43469
-HOSTNAME = localhost
-
-[core]
-PORT = 43470
-HOSTNAME = localhost
-#TOTAL_QUOTA_IN = 9321
-#TOTAL_QUOTA_OUT = 9321
-TOTAL_QUOTA_IN = 3932160
-TOTAL_QUOTA_OUT = 3932160
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-core
-
+QUOTA = 2 GB
+#PLUGIN = heap
+#
 [fs]
-PORT = 43471
-HOSTNAME = localhost
-#OPTIONS = -L DEBUG
-CONTENT_CACHING = NO
-CONTENT_PUSHING = NO
-#DEBUG = YES
-PREFIX = valgrind --tool=memcheck --leak-check=yes --trace-children=yes
-BINARY = /home/grothoff/bin/gnunet-service-fs
-#PREFIX = xterm -e gdb -x cmd --args 
-
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
-
+FORCESTART = YES
 
+[testbed]
+OVERLAY_TOPOLOGY = CLIQUE