aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-07-21 08:13:49 +0000
committerChristian Grothoff <christian@grothoff.org>2010-07-21 08:13:49 +0000
commitfa30930ecac34592d32c949eed359bbe2a124a9d (patch)
tree2285414fe94cf920df56cd150508fe6112257969 /src
parent3eee645835d7ae3f2fbe838cd2af55836b3997ae (diff)
downloadgnunet-fa30930ecac34592d32c949eed359bbe2a124a9d.tar.gz
gnunet-fa30930ecac34592d32c949eed359bbe2a124a9d.zip
use defaults
Diffstat (limited to 'src')
-rw-r--r--src/dht/test_dht_api_data.conf78
-rw-r--r--src/dht/test_dht_api_peer1.conf28
-rw-r--r--src/dht/test_dht_multipeer_data.conf10
-rw-r--r--src/dht/test_dht_twopeer_data.conf34
-rw-r--r--src/dht/test_dhtlog_data.conf27
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/
3DEFAULTCONFIG = test_dht_api_data.conf 3DEFAULTCONFIG = test_dht_api_data.conf
4 4
5[fs] 5[fs]
6ACCEPT_FROM6 = ::1; 6AUTOSTART = NO
7ACCEPT_FROM = 127.0.0.1;
8BINARY = gnunet-service-fs
9CONFIG = $DEFAULTCONFIG
10HOME = $SERVICEHOME
11HOSTNAME = localhost
12PORT = 2094
13INDEXDB = $SERVICEHOME/idxinfo.lst
14 7
15[datastore-sqlite] 8[datastore-sqlite]
16FILENAME = $SERVICEHOME/datastore/sqlite.db 9FILENAME = $SERVICEHOME/datastore/sqlite.db
17 10
18[datastore] 11[datastore]
19DATABASE = sqlite 12AUTOSTART = NO
20BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
21QUOTA = 100000000
22ACCEPT_FROM6 = ::1;
23ACCEPT_FROM = 127.0.0.1;
24BINARY = gnunet-service-datastore
25CONFIG = $DEFAULTCONFIG
26HOME = $SERVICEHOME
27HOSTNAME = localhost
28PORT = 2093
29
30[hostlist]
31HTTP-PROXY =
32SERVERS = http://gnunet.org:8080/
33OPTIONS = -b
34BINARY = gnunet-daemon-hostlist
35CONFIG = $DEFAULTCONFIG
36HOME = $SERVICEHOME
37HOSTNAME = localhost
38HTTPPORT = 8080
39 13
40[topology] 14[topology]
41BINARY = gnunet-daemon-topology
42CONFIG = $DEFAULTCONFIG
43FRIENDS = $SERVICEHOME/friends
44TARGET-CONNECTION-COUNT = 16 15TARGET-CONNECTION-COUNT = 16
45AUTOCONNECT = YES 16AUTOCONNECT = YES
46FRIENDS-ONLY = NO 17FRIENDS-ONLY = NO
@@ -49,74 +20,29 @@ MINIMUM-FRIENDS = 0
49[core] 20[core]
50TOTAL_QUOTA_OUT = 3932160 21TOTAL_QUOTA_OUT = 3932160
51TOTAL_QUOTA_IN = 3932160 22TOTAL_QUOTA_IN = 3932160
52ACCEPT_FROM6 = ::1;
53ACCEPT_FROM = 127.0.0.1;
54BINARY = gnunet-service-core
55CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME
57HOSTNAME = localhost
58PORT = 2092 23PORT = 2092
59 24
60[dht] 25[dht]
61DEBUG = YES 26DEBUG = YES
62ACCEPT_FROM6 = ::1;
63ACCEPT_FROM = 127.0.0.1;
64BINARY = gnunet-service-dht
65CONFIG = $DEFAULTCONFIG
66HOME = $SERVICEHOME
67HOSTNAME = localhost
68PORT = 12370 27PORT = 12370
69 28
70[transport] 29[transport]
71plugins = tcp 30plugins = tcp
72DEBUG = NO 31DEBUG = NO
73PREFIX =
74ACCEPT_FROM6 = ::1;
75ACCEPT_FROM = 127.0.0.1;
76NEIGHBOUR_LIMIT = 50 32NEIGHBOUR_LIMIT = 50
77BINARY = gnunet-service-transport
78CONFIG = $DEFAULTCONFIG
79HOME = $SERVICEHOME
80HOSTNAME = localhost
81PORT = 2091 33PORT = 2091
82 34
83[peerinfo] 35[peerinfo]
84TRUST = $SERVICEHOME/data/credit/
85HOSTS = $SERVICEHOME/data/hosts/
86ACCEPT_FROM6 = ::1;
87ACCEPT_FROM = 127.0.0.1;
88BINARY = gnunet-service-peerinfo
89CONFIG = $DEFAULTCONFIG
90HOME = $SERVICEHOME
91HOSTNAME = localhost
92PORT = 2090 36PORT = 2090
93 37
94[resolver] 38[resolver]
95ACCEPT_FROM6 = ::1;
96ACCEPT_FROM = 127.0.0.1;
97BINARY = gnunet-service-resolver
98CONFIG = $DEFAULTCONFIG
99HOME = $SERVICEHOME
100HOSTNAME = localhost
101PORT = 2089 39PORT = 2089
102 40
103[statistics] 41[statistics]
104ACCEPT_FROM6 = ::1;
105ACCEPT_FROM = 127.0.0.1;
106BINARY = gnunet-service-statistics
107CONFIG = $DEFAULTCONFIG
108HOME = $SERVICEHOME
109HOSTNAME = localhost
110PORT = 2088 42PORT = 2088
111 43
112[arm] 44[arm]
113DEFAULTSERVICES = 45DEFAULTSERVICES =
114ACCEPT_FROM6 = ::1;
115ACCEPT_FROM = 127.0.0.1;
116BINARY = gnunet-service-arm
117CONFIG = $DEFAULTCONFIG
118HOME = $SERVICEHOME
119HOSTNAME = localhost
120PORT = 2087 46PORT = 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]
2ACCEPT_FROM6 = ::1; 2AUTOSTART = NO
3ACCEPT_FROM = 127.0.0.1;
4BINARY = gnunet-service-fs
5CONFIG = $DEFAULTCONFIG
6HOME = $SERVICEHOME
7HOSTNAME = localhost
8PORT = 2094
9INDEXDB = $SERVICEHOME/idxinfo.lst
10 3
11[dht] 4[dht]
12DEBUG = NO 5DEBUG = NO
13AUTOSTART = YES 6AUTOSTART = YES
14ACCEPT_FROM6 = ::1; 7ACCEPT_FROM6 = ::1;
15ACCEPT_FROM = 127.0.0.1; 8ACCEPT_FROM = 127.0.0.1;
16BINARY = gnunet-service-dht
17CONFIG = $DEFAULTCONFIG
18HOME = $SERVICEHOME
19HOSTNAME = localhost 9HOSTNAME = localhost
20PORT = 2100 10PORT = 2100
21 11
@@ -29,31 +19,15 @@ DEBUG = NO
29ACCEPT_FROM6 = ::1; 19ACCEPT_FROM6 = ::1;
30ACCEPT_FROM = 127.0.0.1; 20ACCEPT_FROM = 127.0.0.1;
31NEIGHBOUR_LIMIT = 50 21NEIGHBOUR_LIMIT = 50
32BINARY = gnunet-service-transport
33CONFIG = $DEFAULTCONFIG
34HOME = $SERVICEHOME
35HOSTNAME = localhost
36PORT = 12365 22PORT = 12365
37 23
38[core] 24[core]
39TOTAL_QUOTA_OUT = 3932160 25TOTAL_QUOTA_OUT = 3932160
40TOTAL_QUOTA_IN = 3932160 26TOTAL_QUOTA_IN = 3932160
41ACCEPT_FROM6 = ::1;
42ACCEPT_FROM = 127.0.0.1;
43BINARY = gnunet-service-core
44CONFIG = $DEFAULTCONFIG
45HOME = $SERVICEHOME
46HOSTNAME = localhost
47PORT = 12092 27PORT = 12092
48 28
49[arm] 29[arm]
50DEFAULTSERVICES = 30DEFAULTSERVICES =
51ACCEPT_FROM6 = ::1;
52ACCEPT_FROM = 127.0.0.1;
53BINARY = gnunet-service-arm
54CONFIG = $DEFAULTCONFIG
55HOME = $SERVICEHOME
56HOSTNAME = localhost
57PORT = 12366 31PORT = 12366
58DEBUG = YES 32DEBUG = 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]
2ACCEPT_FROM6 = ::1; 2AUTOSTART = NO
3ACCEPT_FROM = 127.0.0.1;
4BINARY = gnunet-service-fs
5CONFIG = $DEFAULTCONFIG
6HOME = $SERVICEHOME
7HOSTNAME = localhost
8PORT = 2094
9INDEXDB = $SERVICEHOME/idxinfo.lst
10 3
11[dht] 4[dht]
12DEBUG = YES 5DEBUG = YES
@@ -14,7 +7,6 @@ STOP_ON_CLOSEST = YES
14AUTOSTART = YES 7AUTOSTART = YES
15ACCEPT_FROM6 = ::1; 8ACCEPT_FROM6 = ::1;
16ACCEPT_FROM = 127.0.0.1; 9ACCEPT_FROM = 127.0.0.1;
17BINARY = 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
20CONFIG = $DEFAULTCONFIG 12CONFIG = $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]
2ACCEPT_FROM6 = ::1; 2AUTOSTART = NO
3ACCEPT_FROM = 127.0.0.1;
4BINARY = gnunet-service-fs
5CONFIG = $DEFAULTCONFIG
6HOME = $SERVICEHOME
7HOSTNAME = localhost
8PORT = 2094
9INDEXDB = $SERVICEHOME/idxinfo.lst
10 3
11[dht] 4[dht]
12DEBUG = YES 5DEBUG = YES
13AUTOSTART = YES 6AUTOSTART = YES
14ACCEPT_FROM6 = ::1;
15ACCEPT_FROM = 127.0.0.1;
16BINARY = 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
20CONFIG = $DEFAULTCONFIG
21HOME = $SERVICEHOME
22HOSTNAME = localhost
23PORT = 2100 8PORT = 2100
24DISABLE_SOCKET_FORWARDING = YES 9DISABLE_SOCKET_FORWARDING = YES
25 10
@@ -30,34 +15,17 @@ DATABASE = sqlite
30[transport] 15[transport]
31PLUGINS = tcp 16PLUGINS = tcp
32DEBUG = NO 17DEBUG = NO
33ACCEPT_FROM6 = ::1;
34ACCEPT_FROM = 127.0.0.1;
35NEIGHBOUR_LIMIT = 50 18NEIGHBOUR_LIMIT = 50
36BINARY = gnunet-service-transport
37CONFIG = $DEFAULTCONFIG
38HOME = $SERVICEHOME
39HOSTNAME = localhost
40PORT = 12365 19PORT = 12365
41 20
42[core] 21[core]
43TOTAL_QUOTA_OUT = 3932160 22TOTAL_QUOTA_OUT = 3932160
44TOTAL_QUOTA_IN = 3932160 23TOTAL_QUOTA_IN = 3932160
45ACCEPT_FROM6 = ::1;
46ACCEPT_FROM = 127.0.0.1;
47BINARY = gnunet-service-core
48CONFIG = $DEFAULTCONFIG
49HOME = $SERVICEHOME
50HOSTNAME = localhost 24HOSTNAME = localhost
51PORT = 12092 25PORT = 12092
52 26
53[arm] 27[arm]
54DEFAULTSERVICES = core dht 28DEFAULTSERVICES = core dht
55ACCEPT_FROM6 = ::1;
56ACCEPT_FROM = 127.0.0.1;
57BINARY = gnunet-service-arm
58CONFIG = $DEFAULTCONFIG
59HOME = $SERVICEHOME
60HOSTNAME = localhost
61PORT = 12366 29PORT = 12366
62DEBUG = YES 30DEBUG = 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]
2ACCEPT_FROM6 = ::1; 2AUTOSTART = NO
3ACCEPT_FROM = 127.0.0.1;
4BINARY = gnunet-service-fs
5CONFIG = $DEFAULTCONFIG
6HOME = $SERVICEHOME
7HOSTNAME = localhost
8PORT = 2094
9INDEXDB = $SERVICEHOME/idxinfo.lst
10 3
11[dhtcache] 4[dhtcache]
12QUOTA = 1000000 5QUOTA = 1000000
@@ -15,34 +8,16 @@ DATABASE = sqlite
15[transport] 8[transport]
16PLUGINS = tcp 9PLUGINS = tcp
17DEBUG = NO 10DEBUG = NO
18ACCEPT_FROM6 = ::1;
19ACCEPT_FROM = 127.0.0.1;
20NEIGHBOUR_LIMIT = 50 11NEIGHBOUR_LIMIT = 50
21BINARY = gnunet-service-transport
22CONFIG = $DEFAULTCONFIG
23HOME = $SERVICEHOME
24HOSTNAME = localhost
25PORT = 12365 12PORT = 12365
26 13
27[core] 14[core]
28TOTAL_QUOTA_OUT = 3932160 15TOTAL_QUOTA_OUT = 3932160
29TOTAL_QUOTA_IN = 3932160 16TOTAL_QUOTA_IN = 3932160
30ACCEPT_FROM6 = ::1;
31ACCEPT_FROM = 127.0.0.1;
32BINARY = gnunet-service-core
33CONFIG = $DEFAULTCONFIG
34HOME = $SERVICEHOME
35HOSTNAME = localhost
36PORT = 12092 17PORT = 12092
37 18
38[arm] 19[arm]
39DEFAULTSERVICES = core dht 20DEFAULTSERVICES = core dht
40ACCEPT_FROM6 = ::1;
41ACCEPT_FROM = 127.0.0.1;
42BINARY = gnunet-service-arm
43CONFIG = $DEFAULTCONFIG
44HOME = $SERVICEHOME
45HOSTNAME = localhost
46PORT = 12366 21PORT = 12366
47DEBUG = NO 22DEBUG = NO
48 23