simplifying configs with includes

1 files changed, 4 insertions, 89 deletions

diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 27fe736b7..6b2f02ee6 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -1,96 +1,11 @@
+@INLINE@ test_fs_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/gnunet-test-fs-lib/
-DEFAULTCONFIG = fs_test_lib_data.conf
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[resolver]
-PORT = 43464
-HOSTNAME = localhost
-
-[transport]
-PORT = 43465
-PLUGINS = tcp
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-transport
-
-[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
-#GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs
-
-[datastore]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-QUOTA = 2000000000
-
-[statistics]
-PORT = 43467
-HOSTNAME = localhost
-
-[transport-tcp]
-BINDTO = 127.0.0.1
-PORT = 43468
-
-[peerinfo]
-PORT = 43469
-HOSTNAME = localhost
+SERVICEHOME = /tmp/gnunet-fs-test-lib/
 
 [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
-
-[fs]
-PORT = 43471
-HOSTNAME = localhost
-#OPTIONS = -L DEBUG
-CONTENT_CACHING = NO
-CONTENT_PUSHING = NO
-DELAY = NO
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=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
-
-
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
 
+[datastore]
+QUOTA = 2000000000