From 7c8383cb97f28bc492d5796ebb510e10946771ca Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 1 Aug 2011 13:16:23 +0000 Subject: [PATCH] simplifying configs with includes --- src/fs/Makefile.am | 1 + src/fs/fs_test_lib_data.conf | 93 +------------------ src/fs/test_fs_data.conf | 60 +----------- src/fs/test_fs_defaults.conf | 73 +++++++++++++++ src/fs/test_fs_download_data.conf | 59 +----------- src/fs/test_fs_file_information_data.conf | 56 +---------- src/fs/test_fs_list_indexed_data.conf | 54 +---------- src/fs/test_fs_namespace_data.conf | 59 +----------- src/fs/test_fs_publish_data.conf | 54 +---------- src/fs/test_fs_search_data.conf | 56 +---------- src/fs/test_fs_unindex_data.conf | 56 +---------- src/fs/test_fs_uri_data.conf | 28 +----- src/fs/test_gnunet_fs_idx_data.conf | 58 +----------- src/fs/test_gnunet_fs_ns_data.conf | 58 +----------- src/fs/test_gnunet_fs_psd_data.conf | 60 +----------- src/fs/test_gnunet_fs_rec_data.conf | 59 +----------- ...test_gnunet_service_fs_migration_data.conf | 83 +---------------- 17 files changed, 95 insertions(+), 872 deletions(-) create mode 100644 src/fs/test_fs_defaults.conf diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 39dce602e..ae8d699a1 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -388,6 +388,7 @@ test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile EXTRA_DIST = \ + test_fs_defaults.conf \ fs_test_lib_data.conf \ test_fs_data.conf \ test_fs_download_data.conf \ 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 diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf index 86abb732e..f2b4e1ee7 100644 --- a/src/fs/test_fs_data.conf +++ b/src/fs/test_fs_data.conf @@ -1,64 +1,8 @@ +@INLINE@ test_fs_defaults.conf [PATHS] -SERVICEHOME = /tmp/gnunet-test-fs/ +SERVICEHOME = /tmp/gnunet-test-fs-data/ DEFAULTCONFIG = test_fs_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 42464 -HOSTNAME = localhost - -[transport] -PORT = 42465 -PLUGINS = -#DEBUG = YES - -[arm] -PORT = 42466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -#DEBUG = YES - -[statistics] -PORT = 42467 -HOSTNAME = localhost - -[peerinfo] -PORT = 42469 -HOSTNAME = localhost - -[core] -PORT = 42470 -HOSTNAME = localhost - [fs] -PORT = 42471 -HOSTNAME = localhost ACTIVEMIGRATION = NO -#DEBUG = YES - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf new file mode 100644 index 000000000..5e54e15ea --- /dev/null +++ b/src/fs/test_fs_defaults.conf @@ -0,0 +1,73 @@ +[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 + +[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 + +[datastore] +QUOTA = 100000000 + +[statistics] +PORT = 43467 +HOSTNAME = localhost + +[transport-tcp] +BINDTO = 127.0.0.1 +PORT = 43468 + +[peerinfo] +PORT = 43469 +HOSTNAME = localhost + +[core] +PORT = 43470 +HOSTNAME = localhost +TOTAL_QUOTA_IN = 65536 +TOTAL_QUOTA_OUT = 65536 + +[fs] +PORT = 43471 +HOSTNAME = localhost +CONTENT_CACHING = YES +CONTENT_PUSHING = YES +DELAY = YES + +[testing] +WEAKRANDOM = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat + +[dhtcache] +QUOTA=65536 +DATABASE=sqlite + +[mesh] +AUTOSTART = NO + +[dns] +AUTOSTART = NO + +[nse] +AUTOSTART = NO diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf index 7509b5ef0..25aad5119 100644 --- a/src/fs/test_fs_download_data.conf +++ b/src/fs/test_fs_download_data.conf @@ -1,62 +1,5 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-download/ DEFAULTCONFIG = test_fs_download_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 42464 -HOSTNAME = localhost - -[transport] -PORT = 42465 -PLUGINS = - -[arm] -PORT = 42466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -#DEBUG = YES - -[statistics] -PORT = 42467 -HOSTNAME = localhost - -[peerinfo] -PORT = 42469 -HOSTNAME = localhost - -[core] -PORT = 42470 -HOSTNAME = localhost - -[fs] -PORT = 42471 -HOSTNAME = localhost -CONTENT_CACHING = NO -CONTENT_PUSHING = NO -# DEBUG = YES -#PREFIX = valgrind --tool=memcheck --leak-check=yes -#BINARY = /home/grothoff/bin/gnunet-service-fs - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 -DATABASE=sqlite - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - - diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf index f0585fe81..09cedf899 100644 --- a/src/fs/test_fs_file_information_data.conf +++ b/src/fs/test_fs_file_information_data.conf @@ -1,62 +1,8 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-file-information/ DEFAULTCONFIG = test_fs_file_information_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 42464 -HOSTNAME = localhost - [transport] -PORT = 42465 PLUGINS = -[arm] -PORT = 42466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -#DEBUG = YES - -[statistics] -PORT = 42467 -HOSTNAME = localhost - -[peerinfo] -PORT = 42469 -HOSTNAME = localhost - -[core] -PORT = 42470 -HOSTNAME = localhost - -[fs] -PORT = 42471 -HOSTNAME = localhost -#DEBUG = YES - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf index 4d6ed7e26..704ba4d66 100644 --- a/src/fs/test_fs_list_indexed_data.conf +++ b/src/fs/test_fs_list_indexed_data.conf @@ -1,63 +1,11 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/ DEFAULTCONFIG = test_fs_list_indexed_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 42464 -HOSTNAME = localhost - [transport] -PORT = 42465 PLUGINS = -[arm] -PORT = 42466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -#DEBUG = YES - -[statistics] -PORT = 42467 -HOSTNAME = localhost - -[peerinfo] -PORT = 42469 -HOSTNAME = localhost - -[core] -PORT = 42470 -HOSTNAME = localhost - [fs] -PORT = 42471 -HOSTNAME = localhost ACTIVEMIGRATION = NO -# DEBUG = YES - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf index 50ea0dc20..3cdd241d7 100644 --- a/src/fs/test_fs_namespace_data.conf +++ b/src/fs/test_fs_namespace_data.conf @@ -1,65 +1,8 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-namespace/ DEFAULTCONFIG = test_fs_namespace_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 42464 -HOSTNAME = localhost - [transport] -PORT = 42465 PLUGINS = -[arm] -PORT = 42466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -# DEBUG = YES - -[statistics] -PORT = 42467 -HOSTNAME = localhost - -[peerinfo] -PORT = 42469 -HOSTNAME = localhost - -[core] -PORT = 42470 -HOSTNAME = localhost - -[fs] -PORT = 42471 -HOSTNAME = localhost -IDENTITY_DIR = $SERVICEHOME/pseudos/ -# DEBUG = YES -CONTENT_CACHING = NO -CONTENT_PUSHING = NO - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf index 404111152..234f2b0ef 100644 --- a/src/fs/test_fs_publish_data.conf +++ b/src/fs/test_fs_publish_data.conf @@ -1,63 +1,11 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-publish/ DEFAULTCONFIG = test_fs_publish_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 42464 -HOSTNAME = localhost - [transport] -PORT = 42465 PLUGINS = -[arm] -PORT = 42466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -#DEBUG = YES - -[statistics] -PORT = 42467 -HOSTNAME = localhost - -[peerinfo] -PORT = 42469 -HOSTNAME = localhost - -[core] -PORT = 42470 -HOSTNAME = localhost - [fs] -PORT = 42471 -HOSTNAME = localhost ACTIVEMIGRATION = NO -#DEBUG = YES - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf index 89086152e..ea5e4c5e3 100644 --- a/src/fs/test_fs_search_data.conf +++ b/src/fs/test_fs_search_data.conf @@ -1,62 +1,8 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-search/ DEFAULTCONFIG = test_fs_search_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 42464 -HOSTNAME = localhost - [transport] -PORT = 42465 PLUGINS = -[arm] -PORT = 42466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -# DEBUG = YES - -[statistics] -PORT = 42467 -HOSTNAME = localhost - -[peerinfo] -PORT = 42469 -HOSTNAME = localhost - -[core] -PORT = 42470 -HOSTNAME = localhost - -[fs] -PORT = 42471 -HOSTNAME = localhost -# DEBUG = YES - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf index a6cb4735c..977d6e759 100644 --- a/src/fs/test_fs_unindex_data.conf +++ b/src/fs/test_fs_unindex_data.conf @@ -1,62 +1,8 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-unindex/ DEFAULTCONFIG = test_fs_unindex_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 42464 -HOSTNAME = localhost - [transport] -PORT = 42465 PLUGINS = -[arm] -PORT = 42466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -#DEBUG = YES - -[statistics] -PORT = 42467 -HOSTNAME = localhost - -[peerinfo] -PORT = 42469 -HOSTNAME = localhost - -[core] -PORT = 42470 -HOSTNAME = localhost - -[fs] -PORT = 42471 -HOSTNAME = localhost -#DEBUG = YES - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/fs/test_fs_uri_data.conf b/src/fs/test_fs_uri_data.conf index d86b99d0c..abc5a73e9 100644 --- a/src/fs/test_fs_uri_data.conf +++ b/src/fs/test_fs_uri_data.conf @@ -1,29 +1,7 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-uri/ -DEFAULTCONFIG = /etc/gnunetd.conf - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[TESTING] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO +[arm] +DEFAULTSERVICES = topology hostlist diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf index f34a24c3f..f852011a8 100644 --- a/src/fs/test_gnunet_fs_idx_data.conf +++ b/src/fs/test_gnunet_fs_idx_data.conf @@ -1,64 +1,8 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-py-idx/ DEFAULTCONFIG = test_gnunet_fs_idx_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 46464 -HOSTNAME = localhost - [transport] -PORT = 46465 PLUGINS = -[arm] -PORT = 46466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -# DEBUG = YES - -[statistics] -PORT = 46467 -HOSTNAME = localhost - -[peerinfo] -PORT = 46469 -HOSTNAME = localhost - -[core] -PORT = 46470 -HOSTNAME = localhost - -[fs] -PORT = 46471 -HOSTNAME = localhost -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck --leak-check=yes -#BINARY = /home/grothoff/bin/gnunet-service-fs - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/fs/test_gnunet_fs_ns_data.conf b/src/fs/test_gnunet_fs_ns_data.conf index 102f76c35..5f297abfa 100644 --- a/src/fs/test_gnunet_fs_ns_data.conf +++ b/src/fs/test_gnunet_fs_ns_data.conf @@ -1,64 +1,8 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-py-ns/ DEFAULTCONFIG = test_gnunet_fs_ns_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 47464 -HOSTNAME = localhost - [transport] -PORT = 47465 PLUGINS = -[arm] -PORT = 47466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -# DEBUG = YES - -[statistics] -PORT = 47467 -HOSTNAME = localhost - -[peerinfo] -PORT = 47469 -HOSTNAME = localhost - -[core] -PORT = 47470 -HOSTNAME = localhost - -[fs] -PORT = 47471 -HOSTNAME = localhost -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck --leak-check=yes -#BINARY = /home/grothoff/bin/gnunet-service-fs - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf index 6c506b183..b68c6b58e 100644 --- a/src/fs/test_gnunet_fs_psd_data.conf +++ b/src/fs/test_gnunet_fs_psd_data.conf @@ -1,66 +1,8 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-py-psd/ DEFAULTCONFIG = test_gnunet_fs_psd_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 45464 -HOSTNAME = localhost - [transport] -PORT = 45465 PLUGINS = -[arm] -PORT = 45466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -#DEBUG = YES - -[statistics] -PORT = 45467 -HOSTNAME = localhost - -[peerinfo] -PORT = 45469 -HOSTNAME = localhost - -[core] -PORT = 45470 -HOSTNAME = localhost - -[fs] -PORT = 45471 -HOSTNAME = localhost -#DEBUG = YES -CONTENT_CACHING = NO -CONTENT_PUSHING = NO -#PREFIX = valgrind --tool=memcheck --leak-check=yes -#BINARY = /home/grothoff/bin/gnunet-service-fs - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf index 7d5a98626..dae8b19a8 100644 --- a/src/fs/test_gnunet_fs_rec_data.conf +++ b/src/fs/test_gnunet_fs_rec_data.conf @@ -1,65 +1,8 @@ +@INLINE@ test_fs_defaults.conf [PATHS] SERVICEHOME = /tmp/gnunet-test-fs-py-rec/ DEFAULTCONFIG = test_gnunet_fs_rec_data.conf -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[resolver] -PORT = 44464 -HOSTNAME = localhost - [transport] -PORT = 44465 PLUGINS = -[arm] -PORT = 44466 -HOSTNAME = localhost -DEFAULTSERVICES = - -[datastore] -PORT = 44472 -# DEBUG = YES - -[statistics] -PORT = 44467 -HOSTNAME = localhost - -[peerinfo] -PORT = 44469 -HOSTNAME = localhost - -[core] -PORT = 44470 -HOSTNAME = localhost - -[fs] -PORT = 44471 -HOSTNAME = localhost -#DEBUG = YES -#PREFIX = valgrind --tool=memcheck --leak-check=yes -#BINARY = /home/grothoff/bin/gnunet-service-fs - -[testing] -WEAKRANDOM = YES - - -[dhtcache] -QUOTA=65536 - -DATABASE=sqlite -[mesh] -AUTOSTART = NO - - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - - 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 - - -- 2.25.1