diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-07-21 08:13:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-07-21 08:13:49 +0000 |
commit | fa30930ecac34592d32c949eed359bbe2a124a9d (patch) | |
tree | 2285414fe94cf920df56cd150508fe6112257969 /src | |
parent | 3eee645835d7ae3f2fbe838cd2af55836b3997ae (diff) | |
download | gnunet-fa30930ecac34592d32c949eed359bbe2a124a9d.tar.gz gnunet-fa30930ecac34592d32c949eed359bbe2a124a9d.zip |
use defaults
Diffstat (limited to 'src')
-rw-r--r-- | src/dht/test_dht_api_data.conf | 78 | ||||
-rw-r--r-- | src/dht/test_dht_api_peer1.conf | 28 | ||||
-rw-r--r-- | src/dht/test_dht_multipeer_data.conf | 10 | ||||
-rw-r--r-- | src/dht/test_dht_twopeer_data.conf | 34 | ||||
-rw-r--r-- | src/dht/test_dhtlog_data.conf | 27 |
5 files changed, 6 insertions, 171 deletions
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf index 44d736aef..df2c53d2a 100644 --- a/src/dht/test_dht_api_data.conf +++ b/src/dht/test_dht_api_data.conf | |||
@@ -3,44 +3,15 @@ SERVICEHOME = /tmp/test-dht-api/ | |||
3 | DEFAULTCONFIG = test_dht_api_data.conf | 3 | DEFAULTCONFIG = test_dht_api_data.conf |
4 | 4 | ||
5 | [fs] | 5 | [fs] |
6 | ACCEPT_FROM6 = ::1; | 6 | AUTOSTART = NO |
7 | ACCEPT_FROM = 127.0.0.1; | ||
8 | BINARY = gnunet-service-fs | ||
9 | CONFIG = $DEFAULTCONFIG | ||
10 | HOME = $SERVICEHOME | ||
11 | HOSTNAME = localhost | ||
12 | PORT = 2094 | ||
13 | INDEXDB = $SERVICEHOME/idxinfo.lst | ||
14 | 7 | ||
15 | [datastore-sqlite] | 8 | [datastore-sqlite] |
16 | FILENAME = $SERVICEHOME/datastore/sqlite.db | 9 | FILENAME = $SERVICEHOME/datastore/sqlite.db |
17 | 10 | ||
18 | [datastore] | 11 | [datastore] |
19 | DATABASE = sqlite | 12 | AUTOSTART = NO |
20 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | ||
21 | QUOTA = 100000000 | ||
22 | ACCEPT_FROM6 = ::1; | ||
23 | ACCEPT_FROM = 127.0.0.1; | ||
24 | BINARY = gnunet-service-datastore | ||
25 | CONFIG = $DEFAULTCONFIG | ||
26 | HOME = $SERVICEHOME | ||
27 | HOSTNAME = localhost | ||
28 | PORT = 2093 | ||
29 | |||
30 | [hostlist] | ||
31 | HTTP-PROXY = | ||
32 | SERVERS = http://gnunet.org:8080/ | ||
33 | OPTIONS = -b | ||
34 | BINARY = gnunet-daemon-hostlist | ||
35 | CONFIG = $DEFAULTCONFIG | ||
36 | HOME = $SERVICEHOME | ||
37 | HOSTNAME = localhost | ||
38 | HTTPPORT = 8080 | ||
39 | 13 | ||
40 | [topology] | 14 | [topology] |
41 | BINARY = gnunet-daemon-topology | ||
42 | CONFIG = $DEFAULTCONFIG | ||
43 | FRIENDS = $SERVICEHOME/friends | ||
44 | TARGET-CONNECTION-COUNT = 16 | 15 | TARGET-CONNECTION-COUNT = 16 |
45 | AUTOCONNECT = YES | 16 | AUTOCONNECT = YES |
46 | FRIENDS-ONLY = NO | 17 | FRIENDS-ONLY = NO |
@@ -49,74 +20,29 @@ MINIMUM-FRIENDS = 0 | |||
49 | [core] | 20 | [core] |
50 | TOTAL_QUOTA_OUT = 3932160 | 21 | TOTAL_QUOTA_OUT = 3932160 |
51 | TOTAL_QUOTA_IN = 3932160 | 22 | TOTAL_QUOTA_IN = 3932160 |
52 | ACCEPT_FROM6 = ::1; | ||
53 | ACCEPT_FROM = 127.0.0.1; | ||
54 | BINARY = gnunet-service-core | ||
55 | CONFIG = $DEFAULTCONFIG | ||
56 | HOME = $SERVICEHOME | ||
57 | HOSTNAME = localhost | ||
58 | PORT = 2092 | 23 | PORT = 2092 |
59 | 24 | ||
60 | [dht] | 25 | [dht] |
61 | DEBUG = YES | 26 | DEBUG = YES |
62 | ACCEPT_FROM6 = ::1; | ||
63 | ACCEPT_FROM = 127.0.0.1; | ||
64 | BINARY = gnunet-service-dht | ||
65 | CONFIG = $DEFAULTCONFIG | ||
66 | HOME = $SERVICEHOME | ||
67 | HOSTNAME = localhost | ||
68 | PORT = 12370 | 27 | PORT = 12370 |
69 | 28 | ||
70 | [transport] | 29 | [transport] |
71 | plugins = tcp | 30 | plugins = tcp |
72 | DEBUG = NO | 31 | DEBUG = NO |
73 | PREFIX = | ||
74 | ACCEPT_FROM6 = ::1; | ||
75 | ACCEPT_FROM = 127.0.0.1; | ||
76 | NEIGHBOUR_LIMIT = 50 | 32 | NEIGHBOUR_LIMIT = 50 |
77 | BINARY = gnunet-service-transport | ||
78 | CONFIG = $DEFAULTCONFIG | ||
79 | HOME = $SERVICEHOME | ||
80 | HOSTNAME = localhost | ||
81 | PORT = 2091 | 33 | PORT = 2091 |
82 | 34 | ||
83 | [peerinfo] | 35 | [peerinfo] |
84 | TRUST = $SERVICEHOME/data/credit/ | ||
85 | HOSTS = $SERVICEHOME/data/hosts/ | ||
86 | ACCEPT_FROM6 = ::1; | ||
87 | ACCEPT_FROM = 127.0.0.1; | ||
88 | BINARY = gnunet-service-peerinfo | ||
89 | CONFIG = $DEFAULTCONFIG | ||
90 | HOME = $SERVICEHOME | ||
91 | HOSTNAME = localhost | ||
92 | PORT = 2090 | 36 | PORT = 2090 |
93 | 37 | ||
94 | [resolver] | 38 | [resolver] |
95 | ACCEPT_FROM6 = ::1; | ||
96 | ACCEPT_FROM = 127.0.0.1; | ||
97 | BINARY = gnunet-service-resolver | ||
98 | CONFIG = $DEFAULTCONFIG | ||
99 | HOME = $SERVICEHOME | ||
100 | HOSTNAME = localhost | ||
101 | PORT = 2089 | 39 | PORT = 2089 |
102 | 40 | ||
103 | [statistics] | 41 | [statistics] |
104 | ACCEPT_FROM6 = ::1; | ||
105 | ACCEPT_FROM = 127.0.0.1; | ||
106 | BINARY = gnunet-service-statistics | ||
107 | CONFIG = $DEFAULTCONFIG | ||
108 | HOME = $SERVICEHOME | ||
109 | HOSTNAME = localhost | ||
110 | PORT = 2088 | 42 | PORT = 2088 |
111 | 43 | ||
112 | [arm] | 44 | [arm] |
113 | DEFAULTSERVICES = | 45 | DEFAULTSERVICES = |
114 | ACCEPT_FROM6 = ::1; | ||
115 | ACCEPT_FROM = 127.0.0.1; | ||
116 | BINARY = gnunet-service-arm | ||
117 | CONFIG = $DEFAULTCONFIG | ||
118 | HOME = $SERVICEHOME | ||
119 | HOSTNAME = localhost | ||
120 | PORT = 2087 | 46 | PORT = 2087 |
121 | 47 | ||
122 | [transport-tcp] | 48 | [transport-tcp] |
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf index d816424d6..013c15ac6 100644 --- a/src/dht/test_dht_api_peer1.conf +++ b/src/dht/test_dht_api_peer1.conf | |||
@@ -1,21 +1,11 @@ | |||
1 | [fs] | 1 | [fs] |
2 | ACCEPT_FROM6 = ::1; | 2 | AUTOSTART = NO |
3 | ACCEPT_FROM = 127.0.0.1; | ||
4 | BINARY = gnunet-service-fs | ||
5 | CONFIG = $DEFAULTCONFIG | ||
6 | HOME = $SERVICEHOME | ||
7 | HOSTNAME = localhost | ||
8 | PORT = 2094 | ||
9 | INDEXDB = $SERVICEHOME/idxinfo.lst | ||
10 | 3 | ||
11 | [dht] | 4 | [dht] |
12 | DEBUG = NO | 5 | DEBUG = NO |
13 | AUTOSTART = YES | 6 | AUTOSTART = YES |
14 | ACCEPT_FROM6 = ::1; | 7 | ACCEPT_FROM6 = ::1; |
15 | ACCEPT_FROM = 127.0.0.1; | 8 | ACCEPT_FROM = 127.0.0.1; |
16 | BINARY = gnunet-service-dht | ||
17 | CONFIG = $DEFAULTCONFIG | ||
18 | HOME = $SERVICEHOME | ||
19 | HOSTNAME = localhost | 9 | HOSTNAME = localhost |
20 | PORT = 2100 | 10 | PORT = 2100 |
21 | 11 | ||
@@ -29,31 +19,15 @@ DEBUG = NO | |||
29 | ACCEPT_FROM6 = ::1; | 19 | ACCEPT_FROM6 = ::1; |
30 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
31 | NEIGHBOUR_LIMIT = 50 | 21 | NEIGHBOUR_LIMIT = 50 |
32 | BINARY = gnunet-service-transport | ||
33 | CONFIG = $DEFAULTCONFIG | ||
34 | HOME = $SERVICEHOME | ||
35 | HOSTNAME = localhost | ||
36 | PORT = 12365 | 22 | PORT = 12365 |
37 | 23 | ||
38 | [core] | 24 | [core] |
39 | TOTAL_QUOTA_OUT = 3932160 | 25 | TOTAL_QUOTA_OUT = 3932160 |
40 | TOTAL_QUOTA_IN = 3932160 | 26 | TOTAL_QUOTA_IN = 3932160 |
41 | ACCEPT_FROM6 = ::1; | ||
42 | ACCEPT_FROM = 127.0.0.1; | ||
43 | BINARY = gnunet-service-core | ||
44 | CONFIG = $DEFAULTCONFIG | ||
45 | HOME = $SERVICEHOME | ||
46 | HOSTNAME = localhost | ||
47 | PORT = 12092 | 27 | PORT = 12092 |
48 | 28 | ||
49 | [arm] | 29 | [arm] |
50 | DEFAULTSERVICES = | 30 | DEFAULTSERVICES = |
51 | ACCEPT_FROM6 = ::1; | ||
52 | ACCEPT_FROM = 127.0.0.1; | ||
53 | BINARY = gnunet-service-arm | ||
54 | CONFIG = $DEFAULTCONFIG | ||
55 | HOME = $SERVICEHOME | ||
56 | HOSTNAME = localhost | ||
57 | PORT = 12366 | 31 | PORT = 12366 |
58 | DEBUG = YES | 32 | DEBUG = YES |
59 | 33 | ||
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf index b8458c431..f9283ee89 100644 --- a/src/dht/test_dht_multipeer_data.conf +++ b/src/dht/test_dht_multipeer_data.conf | |||
@@ -1,12 +1,5 @@ | |||
1 | [fs] | 1 | [fs] |
2 | ACCEPT_FROM6 = ::1; | 2 | AUTOSTART = NO |
3 | ACCEPT_FROM = 127.0.0.1; | ||
4 | BINARY = gnunet-service-fs | ||
5 | CONFIG = $DEFAULTCONFIG | ||
6 | HOME = $SERVICEHOME | ||
7 | HOSTNAME = localhost | ||
8 | PORT = 2094 | ||
9 | INDEXDB = $SERVICEHOME/idxinfo.lst | ||
10 | 3 | ||
11 | [dht] | 4 | [dht] |
12 | DEBUG = YES | 5 | DEBUG = YES |
@@ -14,7 +7,6 @@ STOP_ON_CLOSEST = YES | |||
14 | AUTOSTART = YES | 7 | AUTOSTART = YES |
15 | ACCEPT_FROM6 = ::1; | 8 | ACCEPT_FROM6 = ::1; |
16 | ACCEPT_FROM = 127.0.0.1; | 9 | ACCEPT_FROM = 127.0.0.1; |
17 | BINARY = gnunet-service-dht | ||
18 | #PREFIX = xterm -T dht -e gdb --args | 10 | #PREFIX = xterm -T dht -e gdb --args |
19 | #PREFIX = valgrind --log-file=dht_%p | 11 | #PREFIX = valgrind --log-file=dht_%p |
20 | CONFIG = $DEFAULTCONFIG | 12 | CONFIG = $DEFAULTCONFIG |
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf index a4e8be65e..90f8a0b65 100644 --- a/src/dht/test_dht_twopeer_data.conf +++ b/src/dht/test_dht_twopeer_data.conf | |||
@@ -1,25 +1,10 @@ | |||
1 | [fs] | 1 | [fs] |
2 | ACCEPT_FROM6 = ::1; | 2 | AUTOSTART = NO |
3 | ACCEPT_FROM = 127.0.0.1; | ||
4 | BINARY = gnunet-service-fs | ||
5 | CONFIG = $DEFAULTCONFIG | ||
6 | HOME = $SERVICEHOME | ||
7 | HOSTNAME = localhost | ||
8 | PORT = 2094 | ||
9 | INDEXDB = $SERVICEHOME/idxinfo.lst | ||
10 | 3 | ||
11 | [dht] | 4 | [dht] |
12 | DEBUG = YES | 5 | DEBUG = YES |
13 | AUTOSTART = YES | 6 | AUTOSTART = YES |
14 | ACCEPT_FROM6 = ::1; | ||
15 | ACCEPT_FROM = 127.0.0.1; | ||
16 | BINARY = gnunet-service-dht | ||
17 | #BINARY = gnunet-service-dht-new | ||
18 | #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dht/.libs/gnunet-service-dht-new | ||
19 | #PREFIX = xterm -T dht -e gdb --args | 7 | #PREFIX = xterm -T dht -e gdb --args |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | HOME = $SERVICEHOME | ||
22 | HOSTNAME = localhost | ||
23 | PORT = 2100 | 8 | PORT = 2100 |
24 | DISABLE_SOCKET_FORWARDING = YES | 9 | DISABLE_SOCKET_FORWARDING = YES |
25 | 10 | ||
@@ -30,34 +15,17 @@ DATABASE = sqlite | |||
30 | [transport] | 15 | [transport] |
31 | PLUGINS = tcp | 16 | PLUGINS = tcp |
32 | DEBUG = NO | 17 | DEBUG = NO |
33 | ACCEPT_FROM6 = ::1; | ||
34 | ACCEPT_FROM = 127.0.0.1; | ||
35 | NEIGHBOUR_LIMIT = 50 | 18 | NEIGHBOUR_LIMIT = 50 |
36 | BINARY = gnunet-service-transport | ||
37 | CONFIG = $DEFAULTCONFIG | ||
38 | HOME = $SERVICEHOME | ||
39 | HOSTNAME = localhost | ||
40 | PORT = 12365 | 19 | PORT = 12365 |
41 | 20 | ||
42 | [core] | 21 | [core] |
43 | TOTAL_QUOTA_OUT = 3932160 | 22 | TOTAL_QUOTA_OUT = 3932160 |
44 | TOTAL_QUOTA_IN = 3932160 | 23 | TOTAL_QUOTA_IN = 3932160 |
45 | ACCEPT_FROM6 = ::1; | ||
46 | ACCEPT_FROM = 127.0.0.1; | ||
47 | BINARY = gnunet-service-core | ||
48 | CONFIG = $DEFAULTCONFIG | ||
49 | HOME = $SERVICEHOME | ||
50 | HOSTNAME = localhost | 24 | HOSTNAME = localhost |
51 | PORT = 12092 | 25 | PORT = 12092 |
52 | 26 | ||
53 | [arm] | 27 | [arm] |
54 | DEFAULTSERVICES = core dht | 28 | DEFAULTSERVICES = core dht |
55 | ACCEPT_FROM6 = ::1; | ||
56 | ACCEPT_FROM = 127.0.0.1; | ||
57 | BINARY = gnunet-service-arm | ||
58 | CONFIG = $DEFAULTCONFIG | ||
59 | HOME = $SERVICEHOME | ||
60 | HOSTNAME = localhost | ||
61 | PORT = 12366 | 29 | PORT = 12366 |
62 | DEBUG = YES | 30 | DEBUG = YES |
63 | 31 | ||
diff --git a/src/dht/test_dhtlog_data.conf b/src/dht/test_dhtlog_data.conf index 391f90f86..d2a497f43 100644 --- a/src/dht/test_dhtlog_data.conf +++ b/src/dht/test_dhtlog_data.conf | |||
@@ -1,12 +1,5 @@ | |||
1 | [fs] | 1 | [fs] |
2 | ACCEPT_FROM6 = ::1; | 2 | AUTOSTART = NO |
3 | ACCEPT_FROM = 127.0.0.1; | ||
4 | BINARY = gnunet-service-fs | ||
5 | CONFIG = $DEFAULTCONFIG | ||
6 | HOME = $SERVICEHOME | ||
7 | HOSTNAME = localhost | ||
8 | PORT = 2094 | ||
9 | INDEXDB = $SERVICEHOME/idxinfo.lst | ||
10 | 3 | ||
11 | [dhtcache] | 4 | [dhtcache] |
12 | QUOTA = 1000000 | 5 | QUOTA = 1000000 |
@@ -15,34 +8,16 @@ DATABASE = sqlite | |||
15 | [transport] | 8 | [transport] |
16 | PLUGINS = tcp | 9 | PLUGINS = tcp |
17 | DEBUG = NO | 10 | DEBUG = NO |
18 | ACCEPT_FROM6 = ::1; | ||
19 | ACCEPT_FROM = 127.0.0.1; | ||
20 | NEIGHBOUR_LIMIT = 50 | 11 | NEIGHBOUR_LIMIT = 50 |
21 | BINARY = gnunet-service-transport | ||
22 | CONFIG = $DEFAULTCONFIG | ||
23 | HOME = $SERVICEHOME | ||
24 | HOSTNAME = localhost | ||
25 | PORT = 12365 | 12 | PORT = 12365 |
26 | 13 | ||
27 | [core] | 14 | [core] |
28 | TOTAL_QUOTA_OUT = 3932160 | 15 | TOTAL_QUOTA_OUT = 3932160 |
29 | TOTAL_QUOTA_IN = 3932160 | 16 | TOTAL_QUOTA_IN = 3932160 |
30 | ACCEPT_FROM6 = ::1; | ||
31 | ACCEPT_FROM = 127.0.0.1; | ||
32 | BINARY = gnunet-service-core | ||
33 | CONFIG = $DEFAULTCONFIG | ||
34 | HOME = $SERVICEHOME | ||
35 | HOSTNAME = localhost | ||
36 | PORT = 12092 | 17 | PORT = 12092 |
37 | 18 | ||
38 | [arm] | 19 | [arm] |
39 | DEFAULTSERVICES = core dht | 20 | DEFAULTSERVICES = core dht |
40 | ACCEPT_FROM6 = ::1; | ||
41 | ACCEPT_FROM = 127.0.0.1; | ||
42 | BINARY = gnunet-service-arm | ||
43 | CONFIG = $DEFAULTCONFIG | ||
44 | HOME = $SERVICEHOME | ||
45 | HOSTNAME = localhost | ||
46 | PORT = 12366 | 21 | PORT = 12366 |
47 | DEBUG = NO | 22 | DEBUG = NO |
48 | 23 | ||