diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-01 13:16:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-01 13:16:23 +0000 |
commit | 7c8383cb97f28bc492d5796ebb510e10946771ca (patch) | |
tree | 55959ed3930dfd088a907f47ddc81ad0b0478ef7 /src | |
parent | 86bd880b33b81296ed00a440b394b2f14a443870 (diff) | |
download | gnunet-7c8383cb97f28bc492d5796ebb510e10946771ca.tar.gz gnunet-7c8383cb97f28bc492d5796ebb510e10946771ca.zip |
simplifying configs with includes
Diffstat (limited to 'src')
-rw-r--r-- | src/fs/Makefile.am | 1 | ||||
-rw-r--r-- | src/fs/fs_test_lib_data.conf | 93 | ||||
-rw-r--r-- | src/fs/test_fs_data.conf | 60 | ||||
-rw-r--r-- | src/fs/test_fs_defaults.conf | 73 | ||||
-rw-r--r-- | src/fs/test_fs_download_data.conf | 59 | ||||
-rw-r--r-- | src/fs/test_fs_file_information_data.conf | 56 | ||||
-rw-r--r-- | src/fs/test_fs_list_indexed_data.conf | 54 | ||||
-rw-r--r-- | src/fs/test_fs_namespace_data.conf | 59 | ||||
-rw-r--r-- | src/fs/test_fs_publish_data.conf | 54 | ||||
-rw-r--r-- | src/fs/test_fs_search_data.conf | 56 | ||||
-rw-r--r-- | src/fs/test_fs_unindex_data.conf | 56 | ||||
-rw-r--r-- | src/fs/test_fs_uri_data.conf | 28 | ||||
-rw-r--r-- | src/fs/test_gnunet_fs_idx_data.conf | 58 | ||||
-rw-r--r-- | src/fs/test_gnunet_fs_ns_data.conf | 58 | ||||
-rw-r--r-- | src/fs/test_gnunet_fs_psd_data.conf | 60 | ||||
-rw-r--r-- | src/fs/test_gnunet_fs_rec_data.conf | 59 | ||||
-rw-r--r-- | src/fs/test_gnunet_service_fs_migration_data.conf | 83 |
17 files changed, 95 insertions, 872 deletions
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 39dce602e..ae8d699a1 100644 --- 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 | |||
388 | 388 | ||
389 | 389 | ||
390 | EXTRA_DIST = \ | 390 | EXTRA_DIST = \ |
391 | test_fs_defaults.conf \ | ||
391 | fs_test_lib_data.conf \ | 392 | fs_test_lib_data.conf \ |
392 | test_fs_data.conf \ | 393 | test_fs_data.conf \ |
393 | test_fs_download_data.conf \ | 394 | test_fs_download_data.conf \ |
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf index 27fe736b7..6b2f02ee6 100644 --- a/src/fs/fs_test_lib_data.conf +++ b/src/fs/fs_test_lib_data.conf | |||
@@ -1,96 +1,11 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-lib/ | 3 | SERVICEHOME = /tmp/gnunet-fs-test-lib/ |
3 | DEFAULTCONFIG = fs_test_lib_data.conf | ||
4 | |||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 43464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | ||
13 | PORT = 43465 | ||
14 | PLUGINS = tcp | ||
15 | #DEBUG = YES | ||
16 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
17 | #BINARY = /home/grothoff/bin/gnunet-service-transport | ||
18 | |||
19 | [nat] | ||
20 | DISABLEV6 = YES | ||
21 | ENABLE_UPNP = NO | ||
22 | BEHIND_NAT = NO | ||
23 | ALLOW_NAT = NO | ||
24 | INTERNAL_ADDRESS = 127.0.0.1 | ||
25 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
26 | USE_LOCALADDR = NO | ||
27 | |||
28 | [arm] | ||
29 | PORT = 43466 | ||
30 | HOSTNAME = localhost | ||
31 | DEFAULTSERVICES = fs | ||
32 | #GLOBAL_POSTFIX = -l $SERVICEHOME/{}-logs | ||
33 | |||
34 | [datastore] | ||
35 | #DEBUG = YES | ||
36 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
37 | QUOTA = 2000000000 | ||
38 | |||
39 | [statistics] | ||
40 | PORT = 43467 | ||
41 | HOSTNAME = localhost | ||
42 | |||
43 | [transport-tcp] | ||
44 | BINDTO = 127.0.0.1 | ||
45 | PORT = 43468 | ||
46 | |||
47 | [peerinfo] | ||
48 | PORT = 43469 | ||
49 | HOSTNAME = localhost | ||
50 | 4 | ||
51 | [core] | 5 | [core] |
52 | PORT = 43470 | ||
53 | HOSTNAME = localhost | ||
54 | #TOTAL_QUOTA_IN = 9321 | ||
55 | #TOTAL_QUOTA_OUT = 9321 | ||
56 | TOTAL_QUOTA_IN = 3932160 | 6 | TOTAL_QUOTA_IN = 3932160 |
57 | TOTAL_QUOTA_OUT = 3932160 | 7 | TOTAL_QUOTA_OUT = 3932160 |
58 | #DEBUG = YES | ||
59 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
60 | #BINARY = /home/grothoff/bin/gnunet-service-core | ||
61 | |||
62 | [fs] | ||
63 | PORT = 43471 | ||
64 | HOSTNAME = localhost | ||
65 | #OPTIONS = -L DEBUG | ||
66 | CONTENT_CACHING = NO | ||
67 | CONTENT_PUSHING = NO | ||
68 | DELAY = NO | ||
69 | #DEBUG = YES | ||
70 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
71 | #BINARY = /home/grothoff/bin/gnunet-service-fs | ||
72 | #PREFIX = xterm -e gdb -x cmd --args | ||
73 | |||
74 | [testing] | ||
75 | WEAKRANDOM = YES | ||
76 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
77 | |||
78 | |||
79 | [dhtcache] | ||
80 | QUOTA=65536 | ||
81 | DATABASE=sqlite | ||
82 | |||
83 | [mesh] | ||
84 | AUTOSTART = NO | ||
85 | |||
86 | |||
87 | |||
88 | [dns] | ||
89 | AUTOSTART = NO | ||
90 | |||
91 | |||
92 | |||
93 | [nse] | ||
94 | AUTOSTART = NO | ||
95 | 8 | ||
9 | [datastore] | ||
10 | QUOTA = 2000000000 | ||
96 | 11 | ||
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf index 86abb732e..f2b4e1ee7 100644 --- a/src/fs/test_fs_data.conf +++ b/src/fs/test_fs_data.conf | |||
@@ -1,64 +1,8 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-data/ |
3 | DEFAULTCONFIG = test_fs_data.conf | 4 | DEFAULTCONFIG = test_fs_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 42464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | ||
13 | PORT = 42465 | ||
14 | PLUGINS = | ||
15 | #DEBUG = YES | ||
16 | |||
17 | [arm] | ||
18 | PORT = 42466 | ||
19 | HOSTNAME = localhost | ||
20 | DEFAULTSERVICES = | ||
21 | |||
22 | [datastore] | ||
23 | #DEBUG = YES | ||
24 | |||
25 | [statistics] | ||
26 | PORT = 42467 | ||
27 | HOSTNAME = localhost | ||
28 | |||
29 | [peerinfo] | ||
30 | PORT = 42469 | ||
31 | HOSTNAME = localhost | ||
32 | |||
33 | [core] | ||
34 | PORT = 42470 | ||
35 | HOSTNAME = localhost | ||
36 | |||
37 | [fs] | 6 | [fs] |
38 | PORT = 42471 | ||
39 | HOSTNAME = localhost | ||
40 | ACTIVEMIGRATION = NO | 7 | ACTIVEMIGRATION = NO |
41 | #DEBUG = YES | ||
42 | |||
43 | [testing] | ||
44 | WEAKRANDOM = YES | ||
45 | |||
46 | |||
47 | [dhtcache] | ||
48 | QUOTA=65536 | ||
49 | |||
50 | DATABASE=sqlite | ||
51 | [mesh] | ||
52 | AUTOSTART = NO | ||
53 | |||
54 | |||
55 | |||
56 | [dns] | ||
57 | AUTOSTART = NO | ||
58 | |||
59 | |||
60 | |||
61 | [nse] | ||
62 | AUTOSTART = NO | ||
63 | |||
64 | 8 | ||
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf new file mode 100644 index 000000000..5e54e15ea --- /dev/null +++ b/src/fs/test_fs_defaults.conf | |||
@@ -0,0 +1,73 @@ | |||
1 | [PATHS] | ||
2 | SERVICEHOME = /tmp/gnunet-test-fs-lib/ | ||
3 | DEFAULTCONFIG = fs_test_lib_data.conf | ||
4 | |||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 43464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | ||
13 | PORT = 43465 | ||
14 | PLUGINS = tcp | ||
15 | |||
16 | [nat] | ||
17 | DISABLEV6 = YES | ||
18 | ENABLE_UPNP = NO | ||
19 | BEHIND_NAT = NO | ||
20 | ALLOW_NAT = NO | ||
21 | INTERNAL_ADDRESS = 127.0.0.1 | ||
22 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
23 | USE_LOCALADDR = NO | ||
24 | |||
25 | [arm] | ||
26 | PORT = 43466 | ||
27 | HOSTNAME = localhost | ||
28 | DEFAULTSERVICES = fs | ||
29 | |||
30 | [datastore] | ||
31 | QUOTA = 100000000 | ||
32 | |||
33 | [statistics] | ||
34 | PORT = 43467 | ||
35 | HOSTNAME = localhost | ||
36 | |||
37 | [transport-tcp] | ||
38 | BINDTO = 127.0.0.1 | ||
39 | PORT = 43468 | ||
40 | |||
41 | [peerinfo] | ||
42 | PORT = 43469 | ||
43 | HOSTNAME = localhost | ||
44 | |||
45 | [core] | ||
46 | PORT = 43470 | ||
47 | HOSTNAME = localhost | ||
48 | TOTAL_QUOTA_IN = 65536 | ||
49 | TOTAL_QUOTA_OUT = 65536 | ||
50 | |||
51 | [fs] | ||
52 | PORT = 43471 | ||
53 | HOSTNAME = localhost | ||
54 | CONTENT_CACHING = YES | ||
55 | CONTENT_PUSHING = YES | ||
56 | DELAY = YES | ||
57 | |||
58 | [testing] | ||
59 | WEAKRANDOM = YES | ||
60 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
61 | |||
62 | [dhtcache] | ||
63 | QUOTA=65536 | ||
64 | DATABASE=sqlite | ||
65 | |||
66 | [mesh] | ||
67 | AUTOSTART = NO | ||
68 | |||
69 | [dns] | ||
70 | AUTOSTART = NO | ||
71 | |||
72 | [nse] | ||
73 | AUTOSTART = NO | ||
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf index 7509b5ef0..25aad5119 100644 --- a/src/fs/test_fs_download_data.conf +++ b/src/fs/test_fs_download_data.conf | |||
@@ -1,62 +1,5 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-download/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-download/ |
3 | DEFAULTCONFIG = test_fs_download_data.conf | 4 | DEFAULTCONFIG = test_fs_download_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 42464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | ||
13 | PORT = 42465 | ||
14 | PLUGINS = | ||
15 | |||
16 | [arm] | ||
17 | PORT = 42466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | #DEBUG = YES | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 42467 | ||
26 | HOSTNAME = localhost | ||
27 | |||
28 | [peerinfo] | ||
29 | PORT = 42469 | ||
30 | HOSTNAME = localhost | ||
31 | |||
32 | [core] | ||
33 | PORT = 42470 | ||
34 | HOSTNAME = localhost | ||
35 | |||
36 | [fs] | ||
37 | PORT = 42471 | ||
38 | HOSTNAME = localhost | ||
39 | CONTENT_CACHING = NO | ||
40 | CONTENT_PUSHING = NO | ||
41 | # DEBUG = YES | ||
42 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
43 | #BINARY = /home/grothoff/bin/gnunet-service-fs | ||
44 | |||
45 | [testing] | ||
46 | WEAKRANDOM = YES | ||
47 | |||
48 | |||
49 | [dhtcache] | ||
50 | QUOTA=65536 | ||
51 | DATABASE=sqlite | ||
52 | |||
53 | [mesh] | ||
54 | AUTOSTART = NO | ||
55 | |||
56 | [dns] | ||
57 | AUTOSTART = NO | ||
58 | |||
59 | [nse] | ||
60 | AUTOSTART = NO | ||
61 | |||
62 | |||
diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf index f0585fe81..09cedf899 100644 --- a/src/fs/test_fs_file_information_data.conf +++ b/src/fs/test_fs_file_information_data.conf | |||
@@ -1,62 +1,8 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-file-information/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-file-information/ |
3 | DEFAULTCONFIG = test_fs_file_information_data.conf | 4 | DEFAULTCONFIG = test_fs_file_information_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 42464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | 6 | [transport] |
13 | PORT = 42465 | ||
14 | PLUGINS = | 7 | PLUGINS = |
15 | 8 | ||
16 | [arm] | ||
17 | PORT = 42466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | #DEBUG = YES | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 42467 | ||
26 | HOSTNAME = localhost | ||
27 | |||
28 | [peerinfo] | ||
29 | PORT = 42469 | ||
30 | HOSTNAME = localhost | ||
31 | |||
32 | [core] | ||
33 | PORT = 42470 | ||
34 | HOSTNAME = localhost | ||
35 | |||
36 | [fs] | ||
37 | PORT = 42471 | ||
38 | HOSTNAME = localhost | ||
39 | #DEBUG = YES | ||
40 | |||
41 | [testing] | ||
42 | WEAKRANDOM = YES | ||
43 | |||
44 | |||
45 | [dhtcache] | ||
46 | QUOTA=65536 | ||
47 | |||
48 | DATABASE=sqlite | ||
49 | [mesh] | ||
50 | AUTOSTART = NO | ||
51 | |||
52 | |||
53 | |||
54 | [dns] | ||
55 | AUTOSTART = NO | ||
56 | |||
57 | |||
58 | |||
59 | [nse] | ||
60 | AUTOSTART = NO | ||
61 | |||
62 | |||
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf index 4d6ed7e26..704ba4d66 100644 --- a/src/fs/test_fs_list_indexed_data.conf +++ b/src/fs/test_fs_list_indexed_data.conf | |||
@@ -1,63 +1,11 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/ |
3 | DEFAULTCONFIG = test_fs_list_indexed_data.conf | 4 | DEFAULTCONFIG = test_fs_list_indexed_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 42464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | 6 | [transport] |
13 | PORT = 42465 | ||
14 | PLUGINS = | 7 | PLUGINS = |
15 | 8 | ||
16 | [arm] | ||
17 | PORT = 42466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | #DEBUG = YES | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 42467 | ||
26 | HOSTNAME = localhost | ||
27 | |||
28 | [peerinfo] | ||
29 | PORT = 42469 | ||
30 | HOSTNAME = localhost | ||
31 | |||
32 | [core] | ||
33 | PORT = 42470 | ||
34 | HOSTNAME = localhost | ||
35 | |||
36 | [fs] | 9 | [fs] |
37 | PORT = 42471 | ||
38 | HOSTNAME = localhost | ||
39 | ACTIVEMIGRATION = NO | 10 | ACTIVEMIGRATION = NO |
40 | # DEBUG = YES | ||
41 | |||
42 | [testing] | ||
43 | WEAKRANDOM = YES | ||
44 | |||
45 | |||
46 | [dhtcache] | ||
47 | QUOTA=65536 | ||
48 | |||
49 | DATABASE=sqlite | ||
50 | [mesh] | ||
51 | AUTOSTART = NO | ||
52 | |||
53 | |||
54 | |||
55 | [dns] | ||
56 | AUTOSTART = NO | ||
57 | |||
58 | |||
59 | |||
60 | [nse] | ||
61 | AUTOSTART = NO | ||
62 | |||
63 | 11 | ||
diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf index 50ea0dc20..3cdd241d7 100644 --- a/src/fs/test_fs_namespace_data.conf +++ b/src/fs/test_fs_namespace_data.conf | |||
@@ -1,65 +1,8 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-namespace/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-namespace/ |
3 | DEFAULTCONFIG = test_fs_namespace_data.conf | 4 | DEFAULTCONFIG = test_fs_namespace_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 42464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | 6 | [transport] |
13 | PORT = 42465 | ||
14 | PLUGINS = | 7 | PLUGINS = |
15 | 8 | ||
16 | [arm] | ||
17 | PORT = 42466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | # DEBUG = YES | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 42467 | ||
26 | HOSTNAME = localhost | ||
27 | |||
28 | [peerinfo] | ||
29 | PORT = 42469 | ||
30 | HOSTNAME = localhost | ||
31 | |||
32 | [core] | ||
33 | PORT = 42470 | ||
34 | HOSTNAME = localhost | ||
35 | |||
36 | [fs] | ||
37 | PORT = 42471 | ||
38 | HOSTNAME = localhost | ||
39 | IDENTITY_DIR = $SERVICEHOME/pseudos/ | ||
40 | # DEBUG = YES | ||
41 | CONTENT_CACHING = NO | ||
42 | CONTENT_PUSHING = NO | ||
43 | |||
44 | [testing] | ||
45 | WEAKRANDOM = YES | ||
46 | |||
47 | |||
48 | [dhtcache] | ||
49 | QUOTA=65536 | ||
50 | |||
51 | DATABASE=sqlite | ||
52 | [mesh] | ||
53 | AUTOSTART = NO | ||
54 | |||
55 | |||
56 | |||
57 | [dns] | ||
58 | AUTOSTART = NO | ||
59 | |||
60 | |||
61 | |||
62 | [nse] | ||
63 | AUTOSTART = NO | ||
64 | |||
65 | |||
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf index 404111152..234f2b0ef 100644 --- a/src/fs/test_fs_publish_data.conf +++ b/src/fs/test_fs_publish_data.conf | |||
@@ -1,63 +1,11 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-publish/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-publish/ |
3 | DEFAULTCONFIG = test_fs_publish_data.conf | 4 | DEFAULTCONFIG = test_fs_publish_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 42464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | 6 | [transport] |
13 | PORT = 42465 | ||
14 | PLUGINS = | 7 | PLUGINS = |
15 | 8 | ||
16 | [arm] | ||
17 | PORT = 42466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | #DEBUG = YES | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 42467 | ||
26 | HOSTNAME = localhost | ||
27 | |||
28 | [peerinfo] | ||
29 | PORT = 42469 | ||
30 | HOSTNAME = localhost | ||
31 | |||
32 | [core] | ||
33 | PORT = 42470 | ||
34 | HOSTNAME = localhost | ||
35 | |||
36 | [fs] | 9 | [fs] |
37 | PORT = 42471 | ||
38 | HOSTNAME = localhost | ||
39 | ACTIVEMIGRATION = NO | 10 | ACTIVEMIGRATION = NO |
40 | #DEBUG = YES | ||
41 | |||
42 | [testing] | ||
43 | WEAKRANDOM = YES | ||
44 | |||
45 | |||
46 | [dhtcache] | ||
47 | QUOTA=65536 | ||
48 | |||
49 | DATABASE=sqlite | ||
50 | [mesh] | ||
51 | AUTOSTART = NO | ||
52 | |||
53 | |||
54 | |||
55 | [dns] | ||
56 | AUTOSTART = NO | ||
57 | |||
58 | |||
59 | |||
60 | [nse] | ||
61 | AUTOSTART = NO | ||
62 | |||
63 | 11 | ||
diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf index 89086152e..ea5e4c5e3 100644 --- a/src/fs/test_fs_search_data.conf +++ b/src/fs/test_fs_search_data.conf | |||
@@ -1,62 +1,8 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-search/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-search/ |
3 | DEFAULTCONFIG = test_fs_search_data.conf | 4 | DEFAULTCONFIG = test_fs_search_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 42464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | 6 | [transport] |
13 | PORT = 42465 | ||
14 | PLUGINS = | 7 | PLUGINS = |
15 | 8 | ||
16 | [arm] | ||
17 | PORT = 42466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | # DEBUG = YES | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 42467 | ||
26 | HOSTNAME = localhost | ||
27 | |||
28 | [peerinfo] | ||
29 | PORT = 42469 | ||
30 | HOSTNAME = localhost | ||
31 | |||
32 | [core] | ||
33 | PORT = 42470 | ||
34 | HOSTNAME = localhost | ||
35 | |||
36 | [fs] | ||
37 | PORT = 42471 | ||
38 | HOSTNAME = localhost | ||
39 | # DEBUG = YES | ||
40 | |||
41 | [testing] | ||
42 | WEAKRANDOM = YES | ||
43 | |||
44 | |||
45 | [dhtcache] | ||
46 | QUOTA=65536 | ||
47 | |||
48 | DATABASE=sqlite | ||
49 | [mesh] | ||
50 | AUTOSTART = NO | ||
51 | |||
52 | |||
53 | |||
54 | [dns] | ||
55 | AUTOSTART = NO | ||
56 | |||
57 | |||
58 | |||
59 | [nse] | ||
60 | AUTOSTART = NO | ||
61 | |||
62 | |||
diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf index a6cb4735c..977d6e759 100644 --- a/src/fs/test_fs_unindex_data.conf +++ b/src/fs/test_fs_unindex_data.conf | |||
@@ -1,62 +1,8 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-unindex/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-unindex/ |
3 | DEFAULTCONFIG = test_fs_unindex_data.conf | 4 | DEFAULTCONFIG = test_fs_unindex_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 42464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | 6 | [transport] |
13 | PORT = 42465 | ||
14 | PLUGINS = | 7 | PLUGINS = |
15 | 8 | ||
16 | [arm] | ||
17 | PORT = 42466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | #DEBUG = YES | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 42467 | ||
26 | HOSTNAME = localhost | ||
27 | |||
28 | [peerinfo] | ||
29 | PORT = 42469 | ||
30 | HOSTNAME = localhost | ||
31 | |||
32 | [core] | ||
33 | PORT = 42470 | ||
34 | HOSTNAME = localhost | ||
35 | |||
36 | [fs] | ||
37 | PORT = 42471 | ||
38 | HOSTNAME = localhost | ||
39 | #DEBUG = YES | ||
40 | |||
41 | [testing] | ||
42 | WEAKRANDOM = YES | ||
43 | |||
44 | |||
45 | [dhtcache] | ||
46 | QUOTA=65536 | ||
47 | |||
48 | DATABASE=sqlite | ||
49 | [mesh] | ||
50 | AUTOSTART = NO | ||
51 | |||
52 | |||
53 | |||
54 | [dns] | ||
55 | AUTOSTART = NO | ||
56 | |||
57 | |||
58 | |||
59 | [nse] | ||
60 | AUTOSTART = NO | ||
61 | |||
62 | |||
diff --git a/src/fs/test_fs_uri_data.conf b/src/fs/test_fs_uri_data.conf index d86b99d0c..abc5a73e9 100644 --- a/src/fs/test_fs_uri_data.conf +++ b/src/fs/test_fs_uri_data.conf | |||
@@ -1,29 +1,7 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-uri/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-uri/ |
3 | DEFAULTCONFIG = /etc/gnunetd.conf | ||
4 | |||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [TESTING] | ||
9 | WEAKRANDOM = YES | ||
10 | |||
11 | |||
12 | [dhtcache] | ||
13 | QUOTA=65536 | ||
14 | |||
15 | DATABASE=sqlite | ||
16 | [mesh] | ||
17 | AUTOSTART = NO | ||
18 | |||
19 | |||
20 | |||
21 | [dns] | ||
22 | AUTOSTART = NO | ||
23 | |||
24 | |||
25 | |||
26 | [nse] | ||
27 | AUTOSTART = NO | ||
28 | 4 | ||
5 | [arm] | ||
6 | DEFAULTSERVICES = topology hostlist | ||
29 | 7 | ||
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf index f34a24c3f..f852011a8 100644 --- a/src/fs/test_gnunet_fs_idx_data.conf +++ b/src/fs/test_gnunet_fs_idx_data.conf | |||
@@ -1,64 +1,8 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-py-idx/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-py-idx/ |
3 | DEFAULTCONFIG = test_gnunet_fs_idx_data.conf | 4 | DEFAULTCONFIG = test_gnunet_fs_idx_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 46464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | 6 | [transport] |
13 | PORT = 46465 | ||
14 | PLUGINS = | 7 | PLUGINS = |
15 | 8 | ||
16 | [arm] | ||
17 | PORT = 46466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | # DEBUG = YES | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 46467 | ||
26 | HOSTNAME = localhost | ||
27 | |||
28 | [peerinfo] | ||
29 | PORT = 46469 | ||
30 | HOSTNAME = localhost | ||
31 | |||
32 | [core] | ||
33 | PORT = 46470 | ||
34 | HOSTNAME = localhost | ||
35 | |||
36 | [fs] | ||
37 | PORT = 46471 | ||
38 | HOSTNAME = localhost | ||
39 | #DEBUG = YES | ||
40 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
41 | #BINARY = /home/grothoff/bin/gnunet-service-fs | ||
42 | |||
43 | [testing] | ||
44 | WEAKRANDOM = YES | ||
45 | |||
46 | |||
47 | [dhtcache] | ||
48 | QUOTA=65536 | ||
49 | |||
50 | DATABASE=sqlite | ||
51 | [mesh] | ||
52 | AUTOSTART = NO | ||
53 | |||
54 | |||
55 | |||
56 | [dns] | ||
57 | AUTOSTART = NO | ||
58 | |||
59 | |||
60 | |||
61 | [nse] | ||
62 | AUTOSTART = NO | ||
63 | |||
64 | |||
diff --git a/src/fs/test_gnunet_fs_ns_data.conf b/src/fs/test_gnunet_fs_ns_data.conf index 102f76c35..5f297abfa 100644 --- a/src/fs/test_gnunet_fs_ns_data.conf +++ b/src/fs/test_gnunet_fs_ns_data.conf | |||
@@ -1,64 +1,8 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-py-ns/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-py-ns/ |
3 | DEFAULTCONFIG = test_gnunet_fs_ns_data.conf | 4 | DEFAULTCONFIG = test_gnunet_fs_ns_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 47464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | 6 | [transport] |
13 | PORT = 47465 | ||
14 | PLUGINS = | 7 | PLUGINS = |
15 | 8 | ||
16 | [arm] | ||
17 | PORT = 47466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | # DEBUG = YES | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 47467 | ||
26 | HOSTNAME = localhost | ||
27 | |||
28 | [peerinfo] | ||
29 | PORT = 47469 | ||
30 | HOSTNAME = localhost | ||
31 | |||
32 | [core] | ||
33 | PORT = 47470 | ||
34 | HOSTNAME = localhost | ||
35 | |||
36 | [fs] | ||
37 | PORT = 47471 | ||
38 | HOSTNAME = localhost | ||
39 | #DEBUG = YES | ||
40 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
41 | #BINARY = /home/grothoff/bin/gnunet-service-fs | ||
42 | |||
43 | [testing] | ||
44 | WEAKRANDOM = YES | ||
45 | |||
46 | |||
47 | [dhtcache] | ||
48 | QUOTA=65536 | ||
49 | |||
50 | DATABASE=sqlite | ||
51 | [mesh] | ||
52 | AUTOSTART = NO | ||
53 | |||
54 | |||
55 | |||
56 | [dns] | ||
57 | AUTOSTART = NO | ||
58 | |||
59 | |||
60 | |||
61 | [nse] | ||
62 | AUTOSTART = NO | ||
63 | |||
64 | |||
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf index 6c506b183..b68c6b58e 100644 --- a/src/fs/test_gnunet_fs_psd_data.conf +++ b/src/fs/test_gnunet_fs_psd_data.conf | |||
@@ -1,66 +1,8 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-py-psd/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-py-psd/ |
3 | DEFAULTCONFIG = test_gnunet_fs_psd_data.conf | 4 | DEFAULTCONFIG = test_gnunet_fs_psd_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 45464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | 6 | [transport] |
13 | PORT = 45465 | ||
14 | PLUGINS = | 7 | PLUGINS = |
15 | 8 | ||
16 | [arm] | ||
17 | PORT = 45466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | #DEBUG = YES | ||
23 | |||
24 | [statistics] | ||
25 | PORT = 45467 | ||
26 | HOSTNAME = localhost | ||
27 | |||
28 | [peerinfo] | ||
29 | PORT = 45469 | ||
30 | HOSTNAME = localhost | ||
31 | |||
32 | [core] | ||
33 | PORT = 45470 | ||
34 | HOSTNAME = localhost | ||
35 | |||
36 | [fs] | ||
37 | PORT = 45471 | ||
38 | HOSTNAME = localhost | ||
39 | #DEBUG = YES | ||
40 | CONTENT_CACHING = NO | ||
41 | CONTENT_PUSHING = NO | ||
42 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
43 | #BINARY = /home/grothoff/bin/gnunet-service-fs | ||
44 | |||
45 | [testing] | ||
46 | WEAKRANDOM = YES | ||
47 | |||
48 | |||
49 | [dhtcache] | ||
50 | QUOTA=65536 | ||
51 | |||
52 | DATABASE=sqlite | ||
53 | [mesh] | ||
54 | AUTOSTART = NO | ||
55 | |||
56 | |||
57 | |||
58 | [dns] | ||
59 | AUTOSTART = NO | ||
60 | |||
61 | |||
62 | |||
63 | [nse] | ||
64 | AUTOSTART = NO | ||
65 | |||
66 | |||
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf index 7d5a98626..dae8b19a8 100644 --- a/src/fs/test_gnunet_fs_rec_data.conf +++ b/src/fs/test_gnunet_fs_rec_data.conf | |||
@@ -1,65 +1,8 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/gnunet-test-fs-py-rec/ | 3 | SERVICEHOME = /tmp/gnunet-test-fs-py-rec/ |
3 | DEFAULTCONFIG = test_gnunet_fs_rec_data.conf | 4 | DEFAULTCONFIG = test_gnunet_fs_rec_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 44464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | 6 | [transport] |
13 | PORT = 44465 | ||
14 | PLUGINS = | 7 | PLUGINS = |
15 | 8 | ||
16 | [arm] | ||
17 | PORT = 44466 | ||
18 | HOSTNAME = localhost | ||
19 | DEFAULTSERVICES = | ||
20 | |||
21 | [datastore] | ||
22 | PORT = 44472 | ||
23 | # DEBUG = YES | ||
24 | |||
25 | [statistics] | ||
26 | PORT = 44467 | ||
27 | HOSTNAME = localhost | ||
28 | |||
29 | [peerinfo] | ||
30 | PORT = 44469 | ||
31 | HOSTNAME = localhost | ||
32 | |||
33 | [core] | ||
34 | PORT = 44470 | ||
35 | HOSTNAME = localhost | ||
36 | |||
37 | [fs] | ||
38 | PORT = 44471 | ||
39 | HOSTNAME = localhost | ||
40 | #DEBUG = YES | ||
41 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
42 | #BINARY = /home/grothoff/bin/gnunet-service-fs | ||
43 | |||
44 | [testing] | ||
45 | WEAKRANDOM = YES | ||
46 | |||
47 | |||
48 | [dhtcache] | ||
49 | QUOTA=65536 | ||
50 | |||
51 | DATABASE=sqlite | ||
52 | [mesh] | ||
53 | AUTOSTART = NO | ||
54 | |||
55 | |||
56 | |||
57 | [dns] | ||
58 | AUTOSTART = NO | ||
59 | |||
60 | |||
61 | |||
62 | [nse] | ||
63 | AUTOSTART = NO | ||
64 | |||
65 | |||
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf index 8ed7e2885..93a48715c 100644 --- a/src/fs/test_gnunet_service_fs_migration_data.conf +++ b/src/fs/test_gnunet_service_fs_migration_data.conf | |||
@@ -1,86 +1,5 @@ | |||
1 | @INLINE@ test_fs_defaults.conf | ||
1 | [PATHS] | 2 | [PATHS] |
2 | SERVICEHOME = /tmp/test-gnunet-service-fs-migration/ | 3 | SERVICEHOME = /tmp/test-gnunet-service-fs-migration/ |
3 | DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf | 4 | DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf |
4 | 5 | ||
5 | [gnunetd] | ||
6 | HOSTKEY = $SERVICEHOME/.hostkey | ||
7 | |||
8 | [resolver] | ||
9 | PORT = 43464 | ||
10 | HOSTNAME = localhost | ||
11 | |||
12 | [transport] | ||
13 | PORT = 43465 | ||
14 | PLUGINS = tcp | ||
15 | |||
16 | [nat] | ||
17 | DISABLEV6 = YES | ||
18 | ENABLE_UPNP = NO | ||
19 | BEHIND_NAT = NO | ||
20 | ALLOW_NAT = NO | ||
21 | INTERNAL_ADDRESS = 127.0.0.1 | ||
22 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
23 | USE_LOCALADDR = NO | ||
24 | |||
25 | [arm] | ||
26 | PORT = 43466 | ||
27 | HOSTNAME = localhost | ||
28 | DEFAULTSERVICES = fs | ||
29 | #OPTIONS = -L DEBUG | ||
30 | |||
31 | [datastore] | ||
32 | #DEBUG = YES | ||
33 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
34 | |||
35 | [statistics] | ||
36 | PORT = 43467 | ||
37 | HOSTNAME = localhost | ||
38 | |||
39 | [transport-tcp] | ||
40 | TIMEOUT = 300000 | ||
41 | PORT = 43468 | ||
42 | |||
43 | [peerinfo] | ||
44 | PORT = 43469 | ||
45 | HOSTNAME = localhost | ||
46 | |||
47 | [core] | ||
48 | PORT = 43470 | ||
49 | HOSTNAME = localhost | ||
50 | #TOTAL_QUOTA_IN = 9321 | ||
51 | #TOTAL_QUOTA_OUT = 9321 | ||
52 | TOTAL_QUOTA_IN = 3932160 | ||
53 | TOTAL_QUOTA_OUT = 3932160 | ||
54 | #DEBUG = YES | ||
55 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
56 | |||
57 | [fs] | ||
58 | PORT = 43471 | ||
59 | HOSTNAME = localhost | ||
60 | #OPTIONS = -L DEBUG | ||
61 | CONTENT_CACHING = YES | ||
62 | CONTENT_PUSHING = YES | ||
63 | #DEBUG = YES | ||
64 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | ||
65 | #PREFIX = xterm -e gdb -x cmd --args | ||
66 | |||
67 | [testing] | ||
68 | WEAKRANDOM = YES | ||
69 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
70 | |||
71 | [dhtcache] | ||
72 | QUOTA=65536 | ||
73 | DATABASE=sqlite | ||
74 | |||
75 | [mesh] | ||
76 | AUTOSTART = NO | ||
77 | |||
78 | [dns] | ||
79 | AUTOSTART = NO | ||
80 | |||
81 | |||
82 | |||
83 | [nse] | ||
84 | AUTOSTART = NO | ||
85 | |||
86 | |||