From e04b3d81b8fafd6df42755db513d3cc68433d5b1 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 14 Sep 2011 12:40:08 +0000
Subject: [PATCH] simplifying configs

---
 .../perf_plugin_datastore_data_mysql.conf     | 38 +-----------
 .../perf_plugin_datastore_data_postgres.conf  | 33 +----------
 .../perf_plugin_datastore_data_sqlite.conf    | 37 +-----------
 .../test_datastore_api_data_mysql.conf        | 58 +++----------------
 .../test_datastore_api_data_postgres.conf     | 53 +++--------------
 .../test_datastore_api_data_sqlite.conf       | 54 +++--------------
 src/datastore/test_defaults.conf              | 15 +++++
 .../test_plugin_datastore_data_mysql.conf     | 38 +-----------
 .../test_plugin_datastore_data_postgres.conf  | 33 +----------
 .../test_plugin_datastore_data_sqlite.conf    | 37 +-----------
 10 files changed, 54 insertions(+), 342 deletions(-)
 create mode 100644 src/datastore/test_defaults.conf

diff --git a/src/datastore/perf_plugin_datastore_data_mysql.conf b/src/datastore/perf_plugin_datastore_data_mysql.conf
index e23502700..dd26512e9 100644
--- a/src/datastore/perf_plugin_datastore_data_mysql.conf
+++ b/src/datastore/perf_plugin_datastore_data_mysql.conf
@@ -1,45 +1,11 @@
+@INLINE@ test_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/
+DEFAULTCONFIG = perf_plugin_datastore_data_mysql.conf
 
 [datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = mysql
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-
-[dht]
-AUTOSTART = NO
 
 [datastore-mysql]
 DATABASE = gnunetcheck
-# CONFIG = ~/.my.cnf
-# USER =
-# PASSWORD =
-# HOST = 
-# PORT = 
-
-[dns]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
 
diff --git a/src/datastore/perf_plugin_datastore_data_postgres.conf b/src/datastore/perf_plugin_datastore_data_postgres.conf
index 40b913519..53ce6cfc9 100644
--- a/src/datastore/perf_plugin_datastore_data_postgres.conf
+++ b/src/datastore/perf_plugin_datastore_data_postgres.conf
@@ -1,40 +1,11 @@
+@INLINE@ test_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/
+DEFAULTCONFIG = perf_plugin_datastore_data_postgres.conf
 
 [datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = postgres
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-# DEBUG = YES
-
-[dht]
-AUTOSTART = NO
 
 [datastore-postgres]
 CONFIG = dbname=gnunetcheck
 
-[dns]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-
diff --git a/src/datastore/perf_plugin_datastore_data_sqlite.conf b/src/datastore/perf_plugin_datastore_data_sqlite.conf
index afc1ff024..241d85efc 100644
--- a/src/datastore/perf_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/perf_plugin_datastore_data_sqlite.conf
@@ -1,38 +1,5 @@
+@INLINE@ test_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/
-
-[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
+DEFAULTCONFIG = perf_plugin_datastore_data_sqlite.conf
 
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
-
-
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf
index 20fa06760..c806ab5be 100644
--- a/src/datastore/test_datastore_api_data_postgres.conf
+++ b/src/datastore/test_datastore_api_data_postgres.conf
@@ -1,63 +1,28 @@
+@INLINE@ test_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-datastore-postgres/
+DEFAULTCONFIG = test_datastore_api_data_postgres.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 = postgres
-# 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-postgres]
 CONFIG = dbname=gnunetcheck
 
-[statistics]
-PORT = 22667
-HOSTNAME = localhost
-
-[testing]
-WEAKRANDOM = YES
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
 [fs]
 AUTOSTART = NO
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
 
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf
index 049068333..eaf4f2b5c 100644
--- a/src/datastore/test_datastore_api_data_sqlite.conf
+++ b/src/datastore/test_datastore_api_data_sqlite.conf
@@ -1,60 +1,24 @@
+@INLINE@ test_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/
+DEFAULTCONFIG = test_datastore_api_data_sqlite.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 = sqlite
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
-#BINARY = /home/grothoff/bin/gnunet-service-datastore
-
-[statistics]
-PORT = 22667
-HOSTNAME = localhost
-
-[testing]
-WEAKRANDOM = YES
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
 
 [fs]
 AUTOSTART = NO
 
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf
new file mode 100644
index 000000000..2af5c5315
--- /dev/null
+++ b/src/datastore/test_defaults.conf
@@ -0,0 +1,15 @@
+[datastore]
+PORT = 22654
+QUOTA = 1000000
+
+[dht]
+AUTOSTART = NO
+
+[dns]
+AUTOSTART = NO
+
+[mesh]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
diff --git a/src/datastore/test_plugin_datastore_data_mysql.conf b/src/datastore/test_plugin_datastore_data_mysql.conf
index c35b55a5b..957818ad8 100644
--- a/src/datastore/test_plugin_datastore_data_mysql.conf
+++ b/src/datastore/test_plugin_datastore_data_mysql.conf
@@ -1,45 +1,11 @@
+@INLINE@ test_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/
+DEFAULTCONFIG = test_plugin_datastore_data_mysql.conf
 
 [datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = mysql
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-
-[dht]
-AUTOSTART = NO
 
 [datastore-mysql]
 DATABASE = gnunetcheck
-# CONFIG = ~/.my.cnf
-# USER =
-# PASSWORD =
-# HOST = 
-# PORT = 
-
-[dns]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
 
diff --git a/src/datastore/test_plugin_datastore_data_postgres.conf b/src/datastore/test_plugin_datastore_data_postgres.conf
index e0cb8524f..d79649663 100644
--- a/src/datastore/test_plugin_datastore_data_postgres.conf
+++ b/src/datastore/test_plugin_datastore_data_postgres.conf
@@ -1,40 +1,11 @@
+@INLINE@ test_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/
+DEFAULTCONFIG = test_plugin_datastore_data_postgres.conf
 
 [datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = postgres
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-
-[dht]
-AUTOSTART = NO
 
 [datastore-postgres]
 CONFIG = dbname=gnunetcheck
 
-[dns]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-
diff --git a/src/datastore/test_plugin_datastore_data_sqlite.conf b/src/datastore/test_plugin_datastore_data_sqlite.conf
index 8cca5f848..f1fcf5f7f 100644
--- a/src/datastore/test_plugin_datastore_data_sqlite.conf
+++ b/src/datastore/test_plugin_datastore_data_sqlite.conf
@@ -1,38 +1,5 @@
+@INLINE@ test_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/
-
-[datastore]
-PORT = 22654
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 1000000
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
+DEFAULTCONFIG = test_plugin_datastore_data_sqlite.conf
 
-- 
2.25.1