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