simplifying configs with includes

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 39dce602ec3de65fb22e6f2d1838935e5b95e747..ae8d699a130ec4ebb097e9b30992efda77822545 100644 (file)
--- 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 27fe736b7b933b7372cb2bde26649b2b85d59a48..6b2f02ee6f7b024e78982770334ad7e40b881865 100644 (file)
--- 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 86abb732e23d9d4d2990aa6666ab0890dbc81700..f2b4e1ee7e4e5c9ee298d13cd3fb9abb3a4d34da 100644 (file)
--- 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 (file)
index 0000000..5e54e15
--- /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 7509b5ef0fec134512b01b1715fe293989276811..25aad51194d3f52afb948fa8dfcba998b89ae5c1 100644 (file)
--- 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 f0585fe81aa74b7d70b862d95990736a45dc37f0..09cedf899867158a4e03dccd49dde8fe43567952 100644 (file)
--- 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 4d6ed7e261b9257b8f8c9b83d42890432ea14477..704ba4d66304d3de2056812e2d123eaada1c2ef5 100644 (file)
--- 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 50ea0dc2007925051b06b452c7474aded2dc3dcd..3cdd241d7d4905d07a0d7cdfe2eb5a2197efb880 100644 (file)
--- 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 404111152b7cea8e40db2e09fafce1d5374248a2..234f2b0efd311826b3e515fdbac7d79af17ee8e6 100644 (file)
--- 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 89086152e44053ecd3a8d4b6b6e07f7ea658b56f..ea5e4c5e35fc2ee1fc55a7af0134b92abe02852d 100644 (file)
--- 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 a6cb4735caca8c387a6e510757c0a50740fccb07..977d6e75968561bcb2f7a72ad1b5c797b33efa6f 100644 (file)
--- 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 d86b99d0c1501a50d329fcd1af5558fe660ea354..abc5a73e95ca2315fddce51a3c1627e6d38c41c5 100644 (file)
--- 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 f34a24c3f5f1dbd03c7b67f36b05f7fb6f0b12eb..f852011a87b9547145159757e4f0195538aa66e7 100644 (file)
--- 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 102f76c353d7271e922bfe192b7a3aba2558c997..5f297abfade10bb2893889e2f6e826b84a974cb2 100644 (file)
--- 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 6c506b183223e685d9c796d36c7efb9da8cf00df..b68c6b58e035586253984aa43f26cb274ce1f6e7 100644 (file)
--- 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 7d5a986261c5c3b0fbc038dec506640b197bcd43..dae8b19a88786032ced9ce82c3eb1523b2f76a73 100644 (file)
--- 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 8ed7e2885f83a9153ddf9f630c1a4b28a38a8f84..93a48715c1101eb8ff741ff7239f8812b9d9abb2 100644 (file)
--- 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
-
-