simplifying configs with includes

1 files changed, 1 insertions, 82 deletions

diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf
index 8ed7e2885..93a48715c 100644
--- a/src/fs/test_gnunet_service_fs_migration_data.conf
+++ b/src/fs/test_gnunet_service_fs_migration_data.conf
@@ -1,86 +1,5 @@
+@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
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[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
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-