aboutsummaryrefslogtreecommitdiff
path: root/src/datastore
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-09-14 12:40:08 +0000
committerChristian Grothoff <christian@grothoff.org>2011-09-14 12:40:08 +0000
commite04b3d81b8fafd6df42755db513d3cc68433d5b1 (patch)
tree688196c8c7f743448097ff9848e001c6c4287a3c /src/datastore
parent0b0a88fe9ad47382a1d41f7311f1c26478ded84f (diff)
downloadgnunet-e04b3d81b8fafd6df42755db513d3cc68433d5b1.tar.gz
gnunet-e04b3d81b8fafd6df42755db513d3cc68433d5b1.zip
simplifying configs
Diffstat (limited to 'src/datastore')
-rw-r--r--src/datastore/perf_plugin_datastore_data_mysql.conf38
-rw-r--r--src/datastore/perf_plugin_datastore_data_postgres.conf33
-rw-r--r--src/datastore/perf_plugin_datastore_data_sqlite.conf37
-rw-r--r--src/datastore/test_datastore_api_data_mysql.conf58
-rw-r--r--src/datastore/test_datastore_api_data_postgres.conf53
-rw-r--r--src/datastore/test_datastore_api_data_sqlite.conf54
-rw-r--r--src/datastore/test_defaults.conf15
-rw-r--r--src/datastore/test_plugin_datastore_data_mysql.conf38
-rw-r--r--src/datastore/test_plugin_datastore_data_postgres.conf33
-rw-r--r--src/datastore/test_plugin_datastore_data_sqlite.conf37
10 files changed, 54 insertions, 342 deletions
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 @@
1@INLINE@ test_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/ 3SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/
4DEFAULTCONFIG = perf_plugin_datastore_data_mysql.conf
3 5
4[datastore] 6[datastore]
5PORT = 22654
6HOSTNAME = localhost
7HOME = $SERVICEHOME
8CONFIG = $DEFAULTCONFIG
9BINARY = gnunet-service-datastore
10ACCEPT_FROM = 127.0.0.1;
11ACCEPT_FROM6 = ::1;
12QUOTA = 1000000
13BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
14DATABASE = mysql 7DATABASE = mysql
15# USERNAME =
16# MAXBUF =
17# TIMEOUT =
18# DISABLEV6 =
19# BINDTO =
20# REJECT_FROM =
21# REJECT_FROM6 =
22# PREFIX =
23
24
25[dht]
26AUTOSTART = NO
27 8
28[datastore-mysql] 9[datastore-mysql]
29DATABASE = gnunetcheck 10DATABASE = gnunetcheck
30# CONFIG = ~/.my.cnf
31# USER =
32# PASSWORD =
33# HOST =
34# PORT =
35
36[dns]
37AUTOSTART = NO
38
39[mesh]
40AUTOSTART = NO
41
42[nse]
43AUTOSTART = NO
44
45 11
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 @@
1@INLINE@ test_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/ 3SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/
4DEFAULTCONFIG = perf_plugin_datastore_data_postgres.conf
3 5
4[datastore] 6[datastore]
5PORT = 22654
6HOSTNAME = localhost
7HOME = $SERVICEHOME
8CONFIG = $DEFAULTCONFIG
9BINARY = gnunet-service-datastore
10ACCEPT_FROM = 127.0.0.1;
11ACCEPT_FROM6 = ::1;
12QUOTA = 1000000
13BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
14DATABASE = postgres 7DATABASE = postgres
15# USERNAME =
16# MAXBUF =
17# TIMEOUT =
18# DISABLEV6 =
19# BINDTO =
20# REJECT_FROM =
21# REJECT_FROM6 =
22# PREFIX =
23# DEBUG = YES
24
25[dht]
26AUTOSTART = NO
27 8
28[datastore-postgres] 9[datastore-postgres]
29CONFIG = dbname=gnunetcheck 10CONFIG = dbname=gnunetcheck
30 11
31[dns]
32AUTOSTART = NO
33
34[mesh]
35AUTOSTART = NO
36
37[nse]
38AUTOSTART = NO
39
40
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 @@
1@INLINE@ test_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/ 3SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/
3 4DEFAULTCONFIG = perf_plugin_datastore_data_sqlite.conf
4[datastore]
5PORT = 22654
6HOSTNAME = localhost
7HOME = $SERVICEHOME
8CONFIG = $DEFAULTCONFIG
9BINARY = gnunet-service-datastore
10ACCEPT_FROM = 127.0.0.1;
11ACCEPT_FROM6 = ::1;
12QUOTA = 1000000
13BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
14DATABASE = sqlite
15# USERNAME =
16# MAXBUF =
17# TIMEOUT =
18# DISABLEV6 =
19# BINDTO =
20# REJECT_FROM =
21# REJECT_FROM6 =
22# PREFIX =
23
24[dht]
25AUTOSTART = NO
26
27[mesh]
28AUTOSTART = NO
29
30[dns]
31AUTOSTART = NO
32
33
34
35[nse]
36AUTOSTART = NO
37
38 5
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 @@
1@INLINE@ test_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-datastore-mysql/ 3SERVICEHOME = /tmp/test-gnunet-datastore-mysql/
4DEFAULTCONFIG = test_datastore_api_data_mysql.conf
5
6[TESTING]
7WEAKRANDOM = YES
3 8
4[arm] 9[arm]
5DEFAULTSERVICES =
6PORT = 42466 10PORT = 42466
7HOSTNAME = localhost 11DEFAULTSERVICES =
12
13[statistics]
14PORT = 22667
8 15
9[resolver] 16[resolver]
10PORT = 42464 17PORT = 42464
11HOSTNAME = localhost
12 18
13[datastore] 19[datastore]
14PORT = 22654
15HOSTNAME = localhost
16HOME = $SERVICEHOME
17CONFIG = $DEFAULTCONFIG
18BINARY = gnunet-service-datastore
19ACCEPT_FROM = 127.0.0.1;
20ACCEPT_FROM6 = ::1;
21QUOTA = 10000000 20QUOTA = 10000000
22BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
23DATABASE = mysql 21DATABASE = mysql
24# USERNAME =
25# MAXBUF =
26# TIMEOUT =
27# DISABLEV6 =
28# BINDTO =
29# REJECT_FROM =
30# REJECT_FROM6 =
31# PREFIX =
32# DEBUG = YES
33# PREFIX = xterm -T datastore -e gdb --args
34# PREFIX = valgrind --tool=memcheck --leak-check=yes
35BINARY = gnunet-service-datastore
36 22
37[datastore-mysql] 23[datastore-mysql]
38DATABASE = gnunetcheck 24DATABASE = gnunetcheck
39# CONFIG = ~/.my.cnf
40# USER =
41# PASSWORD =
42# HOST =
43# PORT =
44
45[statistics]
46PORT = 22667
47HOSTNAME = localhost
48
49[testing]
50WEAKRANDOM = YES
51
52[dht]
53AUTOSTART = NO
54
55 25
56[fs] 26[fs]
57AUTOSTART = NO 27AUTOSTART = NO
58 28
59[dns]
60AUTOSTART = NO
61
62[mesh]
63AUTOSTART = NO
64
65[nse]
66AUTOSTART = NO
67
68
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 @@
1@INLINE@ test_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-datastore-postgres/ 3SERVICEHOME = /tmp/test-gnunet-datastore-postgres/
4DEFAULTCONFIG = test_datastore_api_data_postgres.conf
5
6[TESTING]
7WEAKRANDOM = YES
3 8
4[arm] 9[arm]
5DEFAULTSERVICES =
6PORT = 42466 10PORT = 42466
7HOSTNAME = localhost 11DEFAULTSERVICES =
12
13[statistics]
14PORT = 22667
8 15
9[resolver] 16[resolver]
10PORT = 42464 17PORT = 42464
11HOSTNAME = localhost
12 18
13[datastore] 19[datastore]
14PORT = 22654
15HOSTNAME = localhost
16HOME = $SERVICEHOME
17CONFIG = $DEFAULTCONFIG
18BINARY = gnunet-service-datastore
19ACCEPT_FROM = 127.0.0.1;
20ACCEPT_FROM6 = ::1;
21QUOTA = 10000000 20QUOTA = 10000000
22BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
23DATABASE = postgres 21DATABASE = postgres
24# USERNAME =
25# MAXBUF =
26# TIMEOUT =
27# DISABLEV6 =
28# BINDTO =
29# REJECT_FROM =
30# REJECT_FROM6 =
31# PREFIX =
32# DEBUG = YES
33# PREFIX = xterm -T datastore -e gdb --args
34# PREFIX = valgrind --tool=memcheck --leak-check=yes
35BINARY = gnunet-service-datastore
36 22
37[datastore-postgres] 23[datastore-postgres]
38CONFIG = dbname=gnunetcheck 24CONFIG = dbname=gnunetcheck
39 25
40[statistics]
41PORT = 22667
42HOSTNAME = localhost
43
44[testing]
45WEAKRANDOM = YES
46
47[dht]
48AUTOSTART = NO
49
50[mesh]
51AUTOSTART = NO
52
53[fs] 26[fs]
54AUTOSTART = NO 27AUTOSTART = NO
55[dns]
56AUTOSTART = NO
57
58
59
60[nse]
61AUTOSTART = NO
62
63 28
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 @@
1@INLINE@ test_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/ 3SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/
4DEFAULTCONFIG = test_datastore_api_data_sqlite.conf
5
6[TESTING]
7WEAKRANDOM = YES
3 8
4[arm] 9[arm]
5DEFAULTSERVICES =
6PORT = 42466 10PORT = 42466
7HOSTNAME = localhost 11DEFAULTSERVICES =
12
13[statistics]
14PORT = 22667
8 15
9[resolver] 16[resolver]
10PORT = 42464 17PORT = 42464
11HOSTNAME = localhost
12 18
13[datastore] 19[datastore]
14PORT = 22654
15HOSTNAME = localhost
16HOME = $SERVICEHOME
17CONFIG = $DEFAULTCONFIG
18BINARY = gnunet-service-datastore
19ACCEPT_FROM = 127.0.0.1;
20ACCEPT_FROM6 = ::1;
21QUOTA = 10000000 20QUOTA = 10000000
22BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
23DATABASE = sqlite
24# USERNAME =
25# MAXBUF =
26# TIMEOUT =
27# DISABLEV6 =
28# BINDTO =
29# REJECT_FROM =
30# REJECT_FROM6 =
31# PREFIX =
32#DEBUG = YES
33#PREFIX = valgrind --tool=memcheck --leak-check=yes
34#BINARY = /home/grothoff/bin/gnunet-service-datastore
35
36[statistics]
37PORT = 22667
38HOSTNAME = localhost
39
40[testing]
41WEAKRANDOM = YES
42
43[dht]
44AUTOSTART = NO
45
46[mesh]
47AUTOSTART = NO
48 21
49[fs] 22[fs]
50AUTOSTART = NO 23AUTOSTART = NO
51 24
52[dns]
53AUTOSTART = NO
54
55
56
57[nse]
58AUTOSTART = NO
59
60
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 @@
1[datastore]
2PORT = 22654
3QUOTA = 1000000
4
5[dht]
6AUTOSTART = NO
7
8[dns]
9AUTOSTART = NO
10
11[mesh]
12AUTOSTART = NO
13
14[nse]
15AUTOSTART = 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 @@
1@INLINE@ test_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/ 3SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/
4DEFAULTCONFIG = test_plugin_datastore_data_mysql.conf
3 5
4[datastore] 6[datastore]
5PORT = 22654
6HOSTNAME = localhost
7HOME = $SERVICEHOME
8CONFIG = $DEFAULTCONFIG
9BINARY = gnunet-service-datastore
10ACCEPT_FROM = 127.0.0.1;
11ACCEPT_FROM6 = ::1;
12QUOTA = 1000000
13BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
14DATABASE = mysql 7DATABASE = mysql
15# USERNAME =
16# MAXBUF =
17# TIMEOUT =
18# DISABLEV6 =
19# BINDTO =
20# REJECT_FROM =
21# REJECT_FROM6 =
22# PREFIX =
23
24
25[dht]
26AUTOSTART = NO
27 8
28[datastore-mysql] 9[datastore-mysql]
29DATABASE = gnunetcheck 10DATABASE = gnunetcheck
30# CONFIG = ~/.my.cnf
31# USER =
32# PASSWORD =
33# HOST =
34# PORT =
35
36[dns]
37AUTOSTART = NO
38
39[mesh]
40AUTOSTART = NO
41
42[nse]
43AUTOSTART = NO
44
45 11
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 @@
1@INLINE@ test_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/ 3SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/
4DEFAULTCONFIG = test_plugin_datastore_data_postgres.conf
3 5
4[datastore] 6[datastore]
5PORT = 22654
6HOSTNAME = localhost
7HOME = $SERVICEHOME
8CONFIG = $DEFAULTCONFIG
9BINARY = gnunet-service-datastore
10ACCEPT_FROM = 127.0.0.1;
11ACCEPT_FROM6 = ::1;
12QUOTA = 1000000
13BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
14DATABASE = postgres 7DATABASE = postgres
15# USERNAME =
16# MAXBUF =
17# TIMEOUT =
18# DISABLEV6 =
19# BINDTO =
20# REJECT_FROM =
21# REJECT_FROM6 =
22# PREFIX =
23
24
25[dht]
26AUTOSTART = NO
27 8
28[datastore-postgres] 9[datastore-postgres]
29CONFIG = dbname=gnunetcheck 10CONFIG = dbname=gnunetcheck
30 11
31[dns]
32AUTOSTART = NO
33
34[mesh]
35AUTOSTART = NO
36
37[nse]
38AUTOSTART = NO
39
40
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 @@
1@INLINE@ test_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/ 3SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/
3 4DEFAULTCONFIG = test_plugin_datastore_data_sqlite.conf
4[datastore]
5PORT = 22654
6HOSTNAME = localhost
7HOME = $SERVICEHOME
8CONFIG = $DEFAULTCONFIG
9BINARY = gnunet-service-datastore
10ACCEPT_FROM = 127.0.0.1;
11ACCEPT_FROM6 = ::1;
12QUOTA = 1000000
13BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
14DATABASE = sqlite
15# USERNAME =
16# MAXBUF =
17# TIMEOUT =
18# DISABLEV6 =
19# BINDTO =
20# REJECT_FROM =
21# REJECT_FROM6 =
22# PREFIX =
23
24[dht]
25AUTOSTART = NO
26
27[mesh]
28AUTOSTART = NO
29
30[dns]
31AUTOSTART = NO
32
33
34
35[nse]
36AUTOSTART = NO
37
38 5
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-16 06:25:36 +0000