X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ftest_gnunet_service_fs_migration_data.conf;h=b231c0d3e1b6fd51f17fa8d566cf9e074df51bb0;hb=dd1927b960c7cea13733e061a11142274652ba27;hp=ff4b7313b711e89c05650a7dff60fea8ea34fdf9;hpb=445b46d3240aeb26893ec97678e7706ffa8911d4;p=oweals%2Fgnunet.git

diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf
index ff4b7313b..b231c0d3e 100644
--- a/src/fs/test_gnunet_service_fs_migration_data.conf
+++ b/src/fs/test_gnunet_service_fs_migration_data.conf
@@ -1,69 +1,10 @@
+@INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-service-fs-migration/
-DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 43464
-HOSTNAME = localhost
-
-[transport]
-PORT = 43465
-PLUGINS = tcp
-
-[arm]
-PORT = 43466
-HOSTNAME = localhost
-DEFAULTSERVICES = fs
-#OPTIONS = -L DEBUG
-
-[datastore]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-
-[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
-
-[fs]
-PORT = 43471
-HOSTNAME = localhost
-#OPTIONS = -L DEBUG
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes 
-#PREFIX = xterm -e gdb -x cmd --args 
-
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[dhtcache]
-QUOTA=65536
-
-DATABASE=sqlite
-[mesh]
-AUTOSTART = NO
+GNUNET_TEST_HOME = /tmp/test-gnunet-service-fs-migration/
 
+[testbed]
+OVERLAY_TOPOLOGY = CLIQUE
 
+[ats]
+WAN_QUOTA_IN = 3932160
+WAN_QUOTA_OUT = 3932160