diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-04-03 12:40:21 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-04-03 12:40:21 +0000 |
commit | cdfa1eccb82e25b2ff117fb11876302c8aace8cc (patch) | |
tree | 1c3eafb09ee71c157f9c4e6b7d6f6b58b639ac0b /src/gns | |
parent | e7dcc206d3644f49a494370c36757704369b7007 (diff) | |
download | gnunet-cdfa1eccb82e25b2ff117fb11876302c8aace8cc.tar.gz gnunet-cdfa1eccb82e25b2ff117fb11876302c8aace8cc.zip |
-config cleanup and fixes
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/test_gns_defaults.conf | 75 | ||||
-rw-r--r-- | src/gns/test_gns_dht_alice.conf | 92 | ||||
-rw-r--r-- | src/gns/test_gns_dht_bob.conf | 92 | ||||
-rw-r--r-- | src/gns/test_gns_dht_dave.conf | 92 | ||||
-rw-r--r-- | src/gns/test_gns_simple_lookup.conf | 18 | ||||
-rw-r--r-- | src/gns/test_gns_twopeer.conf | 80 |
6 files changed, 18 insertions, 431 deletions
diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf deleted file mode 100644 index 762c9641b..000000000 --- a/src/gns/test_gns_defaults.conf +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | [PATHS] | ||
2 | SERVICEHOME = /tmp/test-gnunet-testing/ | ||
3 | DEFAULTCONFIG = test_testing_defaults.conf | ||
4 | |||
5 | [resolver] | ||
6 | PORT = 2564 | ||
7 | |||
8 | [transport] | ||
9 | PORT = 2565 | ||
10 | PLUGINS = tcp | ||
11 | |||
12 | [arm] | ||
13 | PORT = 2566 | ||
14 | DEFAULTSERVICES = | ||
15 | |||
16 | [statistics] | ||
17 | PORT = 2567 | ||
18 | |||
19 | [transport-tcp] | ||
20 | PORT = 2568 | ||
21 | BINDTO = 127.0.0.1 | ||
22 | |||
23 | [peerinfo] | ||
24 | PORT = 2569 | ||
25 | |||
26 | [core] | ||
27 | PORT = 2570 | ||
28 | |||
29 | [testing] | ||
30 | NUM_PEERS = 5 | ||
31 | WEAKRANDOM = YES | ||
32 | F2F = YES | ||
33 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
34 | |||
35 | [dht] | ||
36 | AUTOSTART = NO | ||
37 | |||
38 | [nat] | ||
39 | DISABLEV6 = YES | ||
40 | ENABLE_UPNP = NO | ||
41 | BEHIND_NAT = NO | ||
42 | ALLOW_NAT = NO | ||
43 | INTERNAL_ADDRESS = 127.0.0.1 | ||
44 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
45 | USE_LOCALADDR = NO | ||
46 | |||
47 | [dns] | ||
48 | AUTOSTART = NO | ||
49 | |||
50 | [nse] | ||
51 | AUTOSTART = NO | ||
52 | |||
53 | [mesh] | ||
54 | AUTOSTART = NO | ||
55 | |||
56 | [datastore] | ||
57 | AUTOSTART = NO | ||
58 | |||
59 | [fs] | ||
60 | AUTOSTART = NO | ||
61 | |||
62 | [dv] | ||
63 | AUTOSTART = NO | ||
64 | |||
65 | [chat] | ||
66 | AUTOSTART = NO | ||
67 | |||
68 | [vpn] | ||
69 | AUTOSTART = NO | ||
70 | |||
71 | [gns] | ||
72 | AUTOSTART = NO | ||
73 | |||
74 | [namestore] | ||
75 | AUTOSTART = NO \ No newline at end of file | ||
diff --git a/src/gns/test_gns_dht_alice.conf b/src/gns/test_gns_dht_alice.conf deleted file mode 100644 index 98f176796..000000000 --- a/src/gns/test_gns_dht_alice.conf +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | @INLINE@ test_gns_defaults.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-gnunet-gns-alice/ | ||
4 | DEFAULTCONFIG = test_gns_dht_alice.conf | ||
5 | |||
6 | [transport-tcp] | ||
7 | PORT = 32568 | ||
8 | |||
9 | [dht] | ||
10 | UNIXPATH = /tmp/gnunet-alice-service-dht.sock | ||
11 | DEBUG = NO | ||
12 | AUTOSTART = YES | ||
13 | ACCEPT_FROM6 = ::1; | ||
14 | ACCEPT_FROM = 127.0.0.1; | ||
15 | HOSTNAME = localhost | ||
16 | PORT = 2101 | ||
17 | BINARY = gnunet-service-dht | ||
18 | |||
19 | [block] | ||
20 | plugins = dht test gns | ||
21 | |||
22 | [dhtcache] | ||
23 | QUOTA = 1 MB | ||
24 | DATABASE = sqlite | ||
25 | |||
26 | [arm] | ||
27 | PORT = 12566 | ||
28 | DEFAULTSERVICES = core namstore gns | ||
29 | UNIXPATH = /tmp/gnunet-alice-service-arm.sock | ||
30 | |||
31 | [statistics] | ||
32 | PORT = 12567 | ||
33 | UNIXPATH = /tmp/gnunet-alice-service-statistics.sock | ||
34 | |||
35 | [resolver] | ||
36 | PORT = 12564 | ||
37 | UNIXPATH = /tmp/gnunet-alice-service-resolver.sock | ||
38 | |||
39 | [peerinfo] | ||
40 | PORT = 12569 | ||
41 | UNIXPATH = /tmp/gnunet-alice-service-peerinfo.sock | ||
42 | |||
43 | [transport] | ||
44 | PORT = 12565 | ||
45 | UNIXPATH = /tmp/gnunet-alice-service-transport.sock | ||
46 | |||
47 | [core] | ||
48 | PORT = 12570 | ||
49 | UNIXPATH = /tmp/gnunet-alice-service-core.sock | ||
50 | |||
51 | [ats] | ||
52 | PORT = 12571 | ||
53 | UNIXPATH = /tmp/gnunet-alice-service-ats.sock | ||
54 | |||
55 | [dns] | ||
56 | UNIXPATH = /tmp/gnunet-alice-service-dns.sock | ||
57 | PORT = 12369 | ||
58 | AUTOSTART = YES | ||
59 | DNS_EXIT = 8.8.8.8 | ||
60 | |||
61 | [gns] | ||
62 | PORT = 12370 | ||
63 | #PREFIX = valgrind -v --leak-check=full --track-origins=yes. | ||
64 | AUTOSTART = YES | ||
65 | BINARY = gnunet-service-gns | ||
66 | ZONEKEY = testkeys/KAILNI4SSH8M6QR6S8QRSGBBLMA8377HL6F60TEMO7S7TT1OR8CG.zkey | ||
67 | HIJACK_DNS = YES | ||
68 | UNIXPATH = /tmp/gnunet-service-gns-alice.sock | ||
69 | HOME = $SERVICEHOME | ||
70 | CONFIG = $DEFAULTCONFIG | ||
71 | AUTO_IMPORT_PKEY = NO | ||
72 | MAX_PARALLEL_BACKGROUND_QUERIES = 10 | ||
73 | DEFAULT_LOOKUP_TIMEOUT = 60 | ||
74 | |||
75 | [namestore] | ||
76 | PORT = 12371 | ||
77 | AUTOSTART = YES | ||
78 | UNIXPATH = /tmp/gnunet-service-namestore-alice.sock | ||
79 | UNIX_MATCH_UID = YES | ||
80 | UNIX_MATCH_GID = YES | ||
81 | HOSTNAME = localhost | ||
82 | HOME = $SERVICEHOME | ||
83 | CONFIG = $DEFAULTCONFIG | ||
84 | BINARY = gnunet-service-namestore | ||
85 | ACCEPT_FROM = 127.0.0.1; | ||
86 | ACCEPT_FROM6 = ::1; | ||
87 | DATABASE = sqlite | ||
88 | ZONEFILE_DIRECTORY = testkeys/ | ||
89 | |||
90 | [namestore-sqlite] | ||
91 | FILENAME = testdb/sqlite-alice.db | ||
92 | |||
diff --git a/src/gns/test_gns_dht_bob.conf b/src/gns/test_gns_dht_bob.conf deleted file mode 100644 index 72dc21a10..000000000 --- a/src/gns/test_gns_dht_bob.conf +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | @INLINE@ test_gns_defaults.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-gnunet-gns-bob/ | ||
4 | DEFAULTCONFIG = test_gns_dht_bob.conf | ||
5 | |||
6 | [transport-tcp] | ||
7 | PORT = 22568 | ||
8 | |||
9 | [dht] | ||
10 | UNIXPATH = /tmp/gnunet-bob-service-dht.sock | ||
11 | DEBUG = NO | ||
12 | AUTOSTART = YES | ||
13 | ACCEPT_FROM6 = ::1; | ||
14 | ACCEPT_FROM = 127.0.0.1; | ||
15 | HOSTNAME = localhost | ||
16 | PORT = 2102 | ||
17 | BINARY = gnunet-service-dht | ||
18 | |||
19 | [block] | ||
20 | plugins = dht test gns | ||
21 | |||
22 | [dhtcache] | ||
23 | QUOTA = 1 MB | ||
24 | DATABASE = sqlite | ||
25 | |||
26 | [arm] | ||
27 | PORT = 22566 | ||
28 | DEFAULTSERVICES = core namestore gns | ||
29 | UNIXPATH = /tmp/gnunet-bob-service-arm.sock | ||
30 | |||
31 | [statistics] | ||
32 | PORT = 22567 | ||
33 | UNIXPATH = /tmp/gnunet-bob-service-statistics.sock | ||
34 | |||
35 | [resolver] | ||
36 | PORT = 22564 | ||
37 | UNIXPATH = /tmp/gnunet-bob-service-resolver.sock | ||
38 | |||
39 | [peerinfo] | ||
40 | PORT = 22569 | ||
41 | UNIXPATH = /tmp/gnunet-bob-service-peerinfo.sock | ||
42 | |||
43 | [transport] | ||
44 | PORT = 22565 | ||
45 | UNIXPATH = /tmp/gnunet-bob-service-transport.sock | ||
46 | |||
47 | [core] | ||
48 | PORT = 22570 | ||
49 | UNIXPATH = /tmp/gnunet-bob-service-core.sock | ||
50 | |||
51 | [ats] | ||
52 | PORT = 22571 | ||
53 | UNIXPATH = /tmp/gnunet-bob-service-ats.sock | ||
54 | |||
55 | [dns] | ||
56 | UNIXPATH = /tmp/gnunet-bob-service-dns.sock | ||
57 | PORT = 22369 | ||
58 | AUTOSTART = YES | ||
59 | DNS_EXIT = 8.8.8.8 | ||
60 | |||
61 | [gns] | ||
62 | PORT = 22370 | ||
63 | #PREFIX = valgrind -v --leak-check=full --track-origins=yes. | ||
64 | AUTOSTART = YES | ||
65 | BINARY = gnunet-service-gns | ||
66 | ZONEKEY = testkeys/KRPVFMVBFKEGUS6KL8SFPEUMORFPP9ERE6AC98KO9NADBMPF7TOG.zkey | ||
67 | HIJACK_DNS = NO | ||
68 | UNIXPATH = /tmp/gnunet-service-gns-bob.sock | ||
69 | HOME = $SERVICEHOME | ||
70 | CONFIG = $DEFAULTCONFIG | ||
71 | AUTO_IMPORT_PKEY = NO | ||
72 | MAX_PARALLEL_BACKGROUND_QUERIES = 10 | ||
73 | DEFAULT_LOOKUP_TIMEOUT = 5 | ||
74 | |||
75 | [namestore] | ||
76 | PORT = 22371 | ||
77 | AUTOSTART = YES | ||
78 | UNIXPATH = /tmp/gnunet-service-namestore-bob.sock | ||
79 | UNIX_MATCH_UID = YES | ||
80 | UNIX_MATCH_GID = YES | ||
81 | HOSTNAME = localhost | ||
82 | HOME = $SERVICEHOME | ||
83 | CONFIG = $DEFAULTCONFIG | ||
84 | BINARY = gnunet-service-namestore | ||
85 | ACCEPT_FROM = 127.0.0.1; | ||
86 | ACCEPT_FROM6 = ::1; | ||
87 | DATABASE = sqlite | ||
88 | ZONEFILE_DIRECTORY = testkeys/ | ||
89 | |||
90 | [namestore-sqlite] | ||
91 | FILENAME = testdb/sqlite-bob.db | ||
92 | |||
diff --git a/src/gns/test_gns_dht_dave.conf b/src/gns/test_gns_dht_dave.conf deleted file mode 100644 index 5f0b20a8c..000000000 --- a/src/gns/test_gns_dht_dave.conf +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | @INLINE@ test_gns_defaults.conf | ||
2 | [PATHS] | ||
3 | SERVICEHOME = /tmp/test-gnunet-gns-dave/ | ||
4 | DEFAULTCONFIG = test_gns_dht_dave.conf | ||
5 | |||
6 | [transport-tcp] | ||
7 | PORT = 32568 | ||
8 | |||
9 | [dht] | ||
10 | UNIXPATH = /tmp/gnunet-service-dht-dave.sock | ||
11 | DEBUG = NO | ||
12 | AUTOSTART = YES | ||
13 | ACCEPT_FROM6 = ::1; | ||
14 | ACCEPT_FROM = 127.0.0.1; | ||
15 | HOSTNAME = localhost | ||
16 | PORT = 2103 | ||
17 | BINARY = gnunet-service-dht | ||
18 | |||
19 | [block] | ||
20 | plugins = dht test gns | ||
21 | |||
22 | [dhtcache] | ||
23 | QUOTA = 1 MB | ||
24 | DATABASE = sqlite | ||
25 | |||
26 | [arm] | ||
27 | PORT = 32566 | ||
28 | DEFAULTSERVICES = core namestore gns | ||
29 | UNIXPATH = /tmp/gnunet-dave-service-arm.sock | ||
30 | |||
31 | [statistics] | ||
32 | PORT = 32567 | ||
33 | UNIXPATH = /tmp/gnunet-dave-service-statistics.sock | ||
34 | |||
35 | [resolver] | ||
36 | PORT = 32564 | ||
37 | UNIXPATH = /tmp/gnunet-dave-service-resolver.sock | ||
38 | |||
39 | [peerinfo] | ||
40 | PORT = 32569 | ||
41 | UNIXPATH = /tmp/gnunet-dave-service-peerinfo.sock | ||
42 | |||
43 | [transport] | ||
44 | PORT = 32565 | ||
45 | UNIXPATH = /tmp/gnunet-dave-service-transport.sock | ||
46 | |||
47 | [core] | ||
48 | PORT = 32570 | ||
49 | UNIXPATH = /tmp/gnunet-dave-service-core.sock | ||
50 | |||
51 | [ats] | ||
52 | PORT = 32571 | ||
53 | UNIXPATH = /tmp/gnunet-dave-service-ats.sock | ||
54 | |||
55 | [dns] | ||
56 | UNIXPATH = /tmp/gnunet-service-dns-dave.sock | ||
57 | PORT = 32369 | ||
58 | AUTOSTART = YES | ||
59 | DNS_EXIT = 8.8.8.8 | ||
60 | |||
61 | [gns] | ||
62 | PORT = 32370 | ||
63 | #PREFIX = valgrind -v --leak-check=full --track-origins=yes. | ||
64 | AUTOSTART = YES | ||
65 | BINARY = gnunet-service-gns | ||
66 | ZONEKEY = testkeys/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey | ||
67 | HIJACK_DNS = NO | ||
68 | UNIXPATH = /tmp/gnunet-service-gns-dave.sock | ||
69 | HOME = $SERVICEHOME | ||
70 | CONFIG = $DEFAULTCONFIG | ||
71 | AUTO_IMPORT_PKEY = NO | ||
72 | MAX_PARALLEL_BACKGROUND_QUERIES = 10 | ||
73 | DEFAULT_LOOKUP_TIMEOUT = 5 | ||
74 | |||
75 | [namestore] | ||
76 | PORT = 32371 | ||
77 | AUTOSTART = YES | ||
78 | UNIXPATH = /tmp/gnunet-service-namestore-dave.sock | ||
79 | UNIX_MATCH_UID = YES | ||
80 | UNIX_MATCH_GID = YES | ||
81 | HOSTNAME = localhost | ||
82 | HOME = $SERVICEHOME | ||
83 | CONFIG = $DEFAULTCONFIG | ||
84 | BINARY = gnunet-service-namestore | ||
85 | ACCEPT_FROM = 127.0.0.1; | ||
86 | ACCEPT_FROM6 = ::1; | ||
87 | DATABASE = sqlite | ||
88 | ZONEFILE_DIRECTORY = testkeys/ | ||
89 | |||
90 | [namestore-sqlite] | ||
91 | FILENAME = testdb/sqlite-dave.db | ||
92 | |||
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf index 3c4f14013..b609e03b2 100644 --- a/src/gns/test_gns_simple_lookup.conf +++ b/src/gns/test_gns_simple_lookup.conf | |||
@@ -88,3 +88,21 @@ AUTOSTART = NO | |||
88 | 88 | ||
89 | [statistics] | 89 | [statistics] |
90 | AUTOSTART = NO | 90 | AUTOSTART = NO |
91 | |||
92 | [namestore] | ||
93 | PORT = 22371 | ||
94 | AUTOSTART = YES | ||
95 | UNIXPATH = /tmp/gnunet-service-namestore-default.sock | ||
96 | UNIX_MATCH_UID = YES | ||
97 | UNIX_MATCH_GID = YES | ||
98 | HOSTNAME = localhost | ||
99 | HOME = $SERVICEHOME | ||
100 | CONFIG = $DEFAULTCONFIG | ||
101 | BINARY = gnunet-service-namestore | ||
102 | ACCEPT_FROM = 127.0.0.1; | ||
103 | ACCEPT_FROM6 = ::1; | ||
104 | DATABASE = sqlite | ||
105 | ZONEFILE_DIRECTORY = $SERVICEHOME | ||
106 | |||
107 | [namestore-sqlite] | ||
108 | FILENAME = $SERVICEHOME/sqlite-default.db | ||
diff --git a/src/gns/test_gns_twopeer.conf b/src/gns/test_gns_twopeer.conf deleted file mode 100644 index 40482975b..000000000 --- a/src/gns/test_gns_twopeer.conf +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | [fs] | ||
2 | AUTOSTART = NO | ||
3 | |||
4 | [resolver] | ||
5 | AUTOSTART = NO | ||
6 | |||
7 | [dht] | ||
8 | DEBUG = NO | ||
9 | AUTOSTART = YES | ||
10 | ACCEPT_FROM6 = ::1; | ||
11 | ACCEPT_FROM = 127.0.0.1; | ||
12 | HOSTNAME = localhost | ||
13 | PORT = 2100 | ||
14 | BINARY = gnunet-service-dht | ||
15 | |||
16 | [block] | ||
17 | plugins = dht test gns | ||
18 | |||
19 | [dhtcache] | ||
20 | QUOTA = 1 MB | ||
21 | DATABASE = sqlite | ||
22 | |||
23 | [transport] | ||
24 | PLUGINS = tcp | ||
25 | DEBUG = NO | ||
26 | ACCEPT_FROM6 = ::1; | ||
27 | ACCEPT_FROM = 127.0.0.1; | ||
28 | NEIGHBOUR_LIMIT = 50 | ||
29 | PORT = 12365 | ||
30 | |||
31 | [ats] | ||
32 | WAN_QUOTA_IN = 1 GB | ||
33 | WAN_QUOTA_OUT = 1 GB | ||
34 | |||
35 | [core] | ||
36 | PORT = 12092 | ||
37 | |||
38 | [arm] | ||
39 | DEFAULTSERVICES = core | ||
40 | PORT = 12366 | ||
41 | DEBUG = NO | ||
42 | |||
43 | [transport-tcp] | ||
44 | TIMEOUT = 300 s | ||
45 | PORT = 12368 | ||
46 | BINDTO = 127.0.0.1 | ||
47 | |||
48 | [TESTING] | ||
49 | WEAKRANDOM = YES | ||
50 | |||
51 | [gnunetd] | ||
52 | HOSTKEY = $SERVICEHOME/.hostkey | ||
53 | |||
54 | [PATHS] | ||
55 | DEFAULTCONFIG = gns.conf | ||
56 | SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/ | ||
57 | |||
58 | |||
59 | [nat] | ||
60 | DISABLEV6 = YES | ||
61 | ENABLE_UPNP = NO | ||
62 | BEHIND_NAT = NO | ||
63 | ALLOW_NAT = NO | ||
64 | INTERNAL_ADDRESS = 127.0.0.1 | ||
65 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
66 | USE_LOCALADDR = NO | ||
67 | |||
68 | [dns] | ||
69 | AUTOSTART = YES | ||
70 | |||
71 | [gns] | ||
72 | AUTOSTART = YES | ||
73 | BINARY = gnunet-service-gns | ||
74 | ZONEKEY = /tmp/alicekey | ||
75 | |||
76 | |||
77 | [nse] | ||
78 | AUTOSTART = NO | ||
79 | |||
80 | |||