simplifying configs

1 files changed, 9 insertions, 49 deletions

diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf
index b734dca08..3dc17c3af 100644
--- a/src/datastore/test_datastore_api_data_mysql.conf
+++ b/src/datastore/test_datastore_api_data_mysql.conf
@@ -1,68 +1,28 @@
+@INLINE@ test_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-datastore-mysql/
+DEFAULTCONFIG = test_datastore_api_data_mysql.conf
+
+[TESTING]
+WEAKRANDOM = YES
 
 [arm]
-DEFAULTSERVICES = 
 PORT = 42466
-HOSTNAME = localhost
+DEFAULTSERVICES = 
+
+[statistics]
+PORT = 22667
 
 [resolver]
 PORT = 42464
-HOSTNAME = localhost
 
 [datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
 QUOTA = 10000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = mysql
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-# DEBUG = YES
-# PREFIX = xterm -T datastore -e gdb --args
-# PREFIX = valgrind --tool=memcheck --leak-check=yes
-BINARY = gnunet-service-datastore
 
 [datastore-mysql]
 DATABASE = gnunetcheck
-# CONFIG = ~/.my.cnf
-# USER =
-# PASSWORD =
-# HOST = 
-# PORT = 
-
-[statistics]
-PORT = 22667
-HOSTNAME = localhost
-
-[testing]
-WEAKRANDOM = YES
-
-[dht]
-AUTOSTART = NO
-
 
 [fs]
 AUTOSTART = NO
 
-[dns]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-