projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0b0a88f)
simplifying configs
authorChristian Grothoff <christian@grothoff.org>
Wed, 14 Sep 2011 12:40:08 +0000 (12:40 +0000)
committerChristian Grothoff <christian@grothoff.org>
Wed, 14 Sep 2011 12:40:08 +0000 (12:40 +0000)
src/datastore/perf_plugin_datastore_data_mysql.conf patch | blob | history
src/datastore/perf_plugin_datastore_data_postgres.conf patch | blob | history
src/datastore/perf_plugin_datastore_data_sqlite.conf patch | blob | history
src/datastore/test_datastore_api_data_mysql.conf patch | blob | history
src/datastore/test_datastore_api_data_postgres.conf patch | blob | history
src/datastore/test_datastore_api_data_sqlite.conf patch | blob | history
src/datastore/test_defaults.conf [new file with mode: 0644] patch | blob
src/datastore/test_plugin_datastore_data_mysql.conf patch | blob | history
src/datastore/test_plugin_datastore_data_postgres.conf patch | blob | history
src/datastore/test_plugin_datastore_data_sqlite.conf patch | blob | history

diff --git a/src/datastore/perf_plugin_datastore_data_mysql.conf b/src/datastore/perf_plugin_datastore_data_mysql.conf
index e2350270028637d0bea5405ee668e128f39315c1..dd26512e9947985e48d7608533b03da86a676ba0 100644 (file)
--- 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 40b91351915bdae2c263099d5d4505f5fdf21029..53ce6cfc9cb9f6825851ef189312bed683ac5062 100644 (file)
--- 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 afc1ff024da5b22ffdb26c932474da284d6d0637..241d85efc8ca932104b07fd22be5bcd1830a1d52 100644 (file)
--- 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 b734dca082172072eac74f2e49738daeb877d172..3dc17c3af26115eb801051e8d4a8fb58bc9a840f 100644 (file)
--- 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 20fa06760bbe7abbcc70585a05f84e5b1c6f0e68..c806ab5bee0be523385c60334e7f314d6e44f342 100644 (file)
--- 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 0490683337cf5aa4a6dda26f934e950c4de65150..eaf4f2b5c3db2b14f36183fadfe25f35f9e16827 100644 (file)
--- 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 (file)
index 0000000..2af5c53
--- /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 c35b55a5bded5ded9685e2b329c0caa1ad4cc921..957818ad80e0976a7b92e443e04f888423830cdf 100644 (file)
--- 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 e0cb8524f60af898208aeb4e56dea2fef11a5b1d..d7964966344c96c130fd172f6d59cf66177d56e0 100644 (file)
--- 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 8cca5f848307098c125a1ac91084272386744d24..f1fcf5f7f27a08be78b26b9c2162295eed9d9d1b 100644 (file)
--- 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
 
Unnamed repository; edit this file 'description' to name the repository.