diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-09 18:38:01 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-09 18:38:01 +0000 |
commit | b581097addc91044432dcb54ce7cff26b9e12de1 (patch) | |
tree | dafeebf08b90707d2cbfb6f5ab75c361ba298d6e /src/integration-tests | |
parent | 81dcb0a35beb7c862ac6f2677933b978aab67038 (diff) | |
download | gnunet-b581097addc91044432dcb54ce7cff26b9e12de1.tar.gz gnunet-b581097addc91044432dcb54ce7cff26b9e12de1.zip |
-getting rid of silly, stupid, useless, often wrong DEFAULTCONFIG setting
Diffstat (limited to 'src/integration-tests')
12 files changed, 3 insertions, 240 deletions
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf index e96c31cf4..70c50ec53 100644 --- a/src/integration-tests/confs/c_bootstrap_server.conf +++ b/src/integration-tests/confs/c_bootstrap_server.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_bootstrap_server/ | 2 | SERVICEHOME = /tmp/c_bootstrap_server/ |
3 | DEFAULTCONFIG = confs/c_bootstrap_server.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -11,7 +10,6 @@ AUTOSTART = YES | |||
11 | PORT = 0 | 10 | PORT = 0 |
12 | HOSTNAME = localhost | 11 | HOSTNAME = localhost |
13 | HOME = $SERVICEHOME | 12 | HOME = $SERVICEHOME |
14 | CONFIG = $DEFAULTCONFIG | ||
15 | BINARY = gnunet-service-dns | 13 | BINARY = gnunet-service-dns |
16 | ACCEPT_FROM = 127.0.0.1; | 14 | ACCEPT_FROM = 127.0.0.1; |
17 | ACCEPT_FROM6 = ::1; | 15 | ACCEPT_FROM6 = ::1; |
@@ -22,7 +20,6 @@ AUTOSTART = YES | |||
22 | PORT = 20017 | 20 | PORT = 20017 |
23 | HOSTNAME = localhost | 21 | HOSTNAME = localhost |
24 | HOME = $SERVICEHOME | 22 | HOME = $SERVICEHOME |
25 | CONFIG = $DEFAULTCONFIG | ||
26 | BINARY = gnunet-service-resolver | 23 | BINARY = gnunet-service-resolver |
27 | ACCEPT_FROM = 127.0.0.1; | 24 | ACCEPT_FROM = 127.0.0.1; |
28 | ACCEPT_FROM6 = ::1; | 25 | ACCEPT_FROM6 = ::1; |
@@ -35,7 +32,6 @@ AUTOSTART = YES | |||
35 | PORT = 20016 | 32 | PORT = 20016 |
36 | HOSTNAME = localhost | 33 | HOSTNAME = localhost |
37 | HOME = $SERVICEHOME | 34 | HOME = $SERVICEHOME |
38 | CONFIG = $DEFAULTCONFIG | ||
39 | BINARY = gnunet-service-mesh | 35 | BINARY = gnunet-service-mesh |
40 | ACCEPT_FROM = 127.0.0.1; | 36 | ACCEPT_FROM = 127.0.0.1; |
41 | ACCEPT_FROM6 = ::1; | 37 | ACCEPT_FROM6 = ::1; |
@@ -48,7 +44,6 @@ AUTOSTART = YES | |||
48 | PORT = 20015 | 44 | PORT = 20015 |
49 | HOSTNAME = localhost | 45 | HOSTNAME = localhost |
50 | HOME = $SERVICEHOME | 46 | HOME = $SERVICEHOME |
51 | CONFIG = $DEFAULTCONFIG | ||
52 | BINARY = gnunet-service-nse | 47 | BINARY = gnunet-service-nse |
53 | ACCEPT_FROM = 127.0.0.1; | 48 | ACCEPT_FROM = 127.0.0.1; |
54 | ACCEPT_FROM6 = ::1; | 49 | ACCEPT_FROM6 = ::1; |
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO | |||
67 | AUTOCONNECT = YES | 62 | AUTOCONNECT = YES |
68 | TARGET-CONNECTION-COUNT = 16 | 63 | TARGET-CONNECTION-COUNT = 16 |
69 | FRIENDS = $SERVICEHOME/friends | 64 | FRIENDS = $SERVICEHOME/friends |
70 | CONFIG = $DEFAULTCONFIG | ||
71 | BINARY = gnunet-daemon-topology | 65 | BINARY = gnunet-daemon-topology |
72 | 66 | ||
73 | [datastore] | 67 | [datastore] |
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES | |||
78 | PORT = 20014 | 72 | PORT = 20014 |
79 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
80 | HOME = $SERVICEHOME | 74 | HOME = $SERVICEHOME |
81 | CONFIG = $DEFAULTCONFIG | ||
82 | BINARY = gnunet-service-datastore | 75 | BINARY = gnunet-service-datastore |
83 | ACCEPT_FROM = 127.0.0.1; | 76 | ACCEPT_FROM = 127.0.0.1; |
84 | ACCEPT_FROM6 = ::1; | 77 | ACCEPT_FROM6 = ::1; |
@@ -101,7 +94,6 @@ AUTOSTART = YES | |||
101 | PORT = 20013 | 94 | PORT = 20013 |
102 | HOSTNAME = localhost | 95 | HOSTNAME = localhost |
103 | HOME = $SERVICEHOME | 96 | HOME = $SERVICEHOME |
104 | CONFIG = $DEFAULTCONFIG | ||
105 | BINARY = gnunet-service-peerinfo | 97 | BINARY = gnunet-service-peerinfo |
106 | ACCEPT_FROM = 127.0.0.1; | 98 | ACCEPT_FROM = 127.0.0.1; |
107 | ACCEPT_FROM6 = ::1; | 99 | ACCEPT_FROM6 = ::1; |
@@ -125,7 +117,6 @@ AUTOSTART = YES | |||
125 | PORT = 20012 | 117 | PORT = 20012 |
126 | HOSTNAME = localhost | 118 | HOSTNAME = localhost |
127 | HOME = $SERVICEHOME | 119 | HOME = $SERVICEHOME |
128 | CONFIG = $DEFAULTCONFIG | ||
129 | BINARY = gnunet-service-ats | 120 | BINARY = gnunet-service-ats |
130 | ACCEPT_FROM = 127.0.0.1; | 121 | ACCEPT_FROM = 127.0.0.1; |
131 | ACCEPT_FROM6 = ::1; | 122 | ACCEPT_FROM6 = ::1; |
@@ -147,7 +138,6 @@ AUTOSTART = YES | |||
147 | PORT = 20011 | 138 | PORT = 20011 |
148 | HOSTNAME = localhost | 139 | HOSTNAME = localhost |
149 | HOME = $SERVICEHOME | 140 | HOME = $SERVICEHOME |
150 | CONFIG = $DEFAULTCONFIG | ||
151 | BINARY = gnunet-service-transport | 141 | BINARY = gnunet-service-transport |
152 | NEIGHBOUR_LIMIT = 50 | 142 | NEIGHBOUR_LIMIT = 50 |
153 | ACCEPT_FROM = 127.0.0.1; | 143 | ACCEPT_FROM = 127.0.0.1; |
@@ -199,7 +189,6 @@ AUTOSTART = NO | |||
199 | PORT = 20006 | 189 | PORT = 20006 |
200 | HOSTNAME = localhost | 190 | HOSTNAME = localhost |
201 | HOME = $SERVICEHOME | 191 | HOME = $SERVICEHOME |
202 | CONFIG = $DEFAULTCONFIG | ||
203 | BINARY = gnunet-service-template | 192 | BINARY = gnunet-service-template |
204 | ACCEPT_FROM = 127.0.0.1; | 193 | ACCEPT_FROM = 127.0.0.1; |
205 | ACCEPT_FROM6 = ::1; | 194 | ACCEPT_FROM6 = ::1; |
@@ -217,7 +206,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
217 | PORT = 20005 | 206 | PORT = 20005 |
218 | HOSTNAME = localhost | 207 | HOSTNAME = localhost |
219 | HOME = $SERVICEHOME | 208 | HOME = $SERVICEHOME |
220 | CONFIG = $DEFAULTCONFIG | ||
221 | BINARY = gnunet-service-fs | 209 | BINARY = gnunet-service-fs |
222 | ACCEPT_FROM = 127.0.0.1; | 210 | ACCEPT_FROM = 127.0.0.1; |
223 | ACCEPT_FROM6 = ::1; | 211 | ACCEPT_FROM6 = ::1; |
@@ -232,7 +220,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
232 | EXPECTED_NEIGHBOUR_COUNT = 128 | 220 | EXPECTED_NEIGHBOUR_COUNT = 128 |
233 | 221 | ||
234 | [vpn] | 222 | [vpn] |
235 | CONFIG = $DEFAULTCONFIG | ||
236 | BINARY = gnunet-daemon-vpn | 223 | BINARY = gnunet-daemon-vpn |
237 | IPV6ADDR = 1234::1 | 224 | IPV6ADDR = 1234::1 |
238 | IPV6PREFIX = 32 | 225 | IPV6PREFIX = 32 |
@@ -243,7 +230,6 @@ VIRTDNS6 = 1234::17 | |||
243 | IFNAME = vpn-gnunet | 230 | IFNAME = vpn-gnunet |
244 | 231 | ||
245 | [exit] | 232 | [exit] |
246 | CONFIG = $DEFAULTCONFIG | ||
247 | BINARY = gnunet-daemon-exit | 233 | BINARY = gnunet-daemon-exit |
248 | IPV6ADDR = 1234:1::1 | 234 | IPV6ADDR = 1234:1::1 |
249 | IPV6PREFIX = 32 | 235 | IPV6PREFIX = 32 |
@@ -258,7 +244,6 @@ AUTOSTART = YES | |||
258 | PORT = 0 | 244 | PORT = 0 |
259 | HOSTNAME = localhost | 245 | HOSTNAME = localhost |
260 | HOME = $SERVICEHOME | 246 | HOME = $SERVICEHOME |
261 | CONFIG = $DEFAULTCONFIG | ||
262 | BINARY = gnunet-service-dns | 247 | BINARY = gnunet-service-dns |
263 | ACCEPT_FROM = 127.0.0.1; | 248 | ACCEPT_FROM = 127.0.0.1; |
264 | ACCEPT_FROM6 = ::1; | 249 | ACCEPT_FROM6 = ::1; |
@@ -269,7 +254,6 @@ PROVIDE_EXIT = NO | |||
269 | PORT = 20004 | 254 | PORT = 20004 |
270 | HOSTNAME = localhost | 255 | HOSTNAME = localhost |
271 | HOME = $SERVICEHOME | 256 | HOME = $SERVICEHOME |
272 | CONFIG = $DEFAULTCONFIG | ||
273 | BINARY = gnunet-service-arm | 257 | BINARY = gnunet-service-arm |
274 | ACCEPT_FROM = 127.0.0.1; | 258 | ACCEPT_FROM = 127.0.0.1; |
275 | ACCEPT_FROM6 = ::1; | 259 | ACCEPT_FROM6 = ::1; |
@@ -282,7 +266,6 @@ UNIX_MATCH_GID = YES | |||
282 | HTTPPORT = 8080 | 266 | HTTPPORT = 8080 |
283 | HOME = $SERVICEHOME | 267 | HOME = $SERVICEHOME |
284 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 268 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
285 | CONFIG = $DEFAULTCONFIG | ||
286 | BINARY = gnunet-daemon-hostlist | 269 | BINARY = gnunet-daemon-hostlist |
287 | OPTIONS = -p | 270 | OPTIONS = -p |
288 | #SERVERS = http://v9.gnunet.org:58080/ | 271 | #SERVERS = http://v9.gnunet.org:58080/ |
@@ -293,7 +276,6 @@ AUTOSTART = YES | |||
293 | PORT = 20003 | 276 | PORT = 20003 |
294 | HOSTNAME = localhost | 277 | HOSTNAME = localhost |
295 | HOME = $SERVICEHOME | 278 | HOME = $SERVICEHOME |
296 | CONFIG = $DEFAULTCONFIG | ||
297 | BINARY = gnunet-service-core | 279 | BINARY = gnunet-service-core |
298 | ACCEPT_FROM = 127.0.0.1; | 280 | ACCEPT_FROM = 127.0.0.1; |
299 | ACCEPT_FROM6 = ::1; | 281 | ACCEPT_FROM6 = ::1; |
@@ -327,7 +309,6 @@ AUTOSTART = YES | |||
327 | PORT = 20001 | 309 | PORT = 20001 |
328 | HOSTNAME = localhost | 310 | HOSTNAME = localhost |
329 | HOME = $SERVICEHOME | 311 | HOME = $SERVICEHOME |
330 | CONFIG = $DEFAULTCONFIG | ||
331 | BINARY = gnunet-service-statistics | 312 | BINARY = gnunet-service-statistics |
332 | ACCEPT_FROM = 127.0.0.1; | 313 | ACCEPT_FROM = 127.0.0.1; |
333 | ACCEPT_FROM6 = ::1; | 314 | ACCEPT_FROM6 = ::1; |
@@ -340,7 +321,6 @@ AUTOSTART = YES | |||
340 | PORT = 20000 | 321 | PORT = 20000 |
341 | HOSTNAME = localhost | 322 | HOSTNAME = localhost |
342 | HOME = $SERVICEHOME | 323 | HOME = $SERVICEHOME |
343 | CONFIG = $DEFAULTCONFIG | ||
344 | BINARY = gnunet-service-dht | 324 | BINARY = gnunet-service-dht |
345 | ACCEPT_FROM = 127.0.0.1; | 325 | ACCEPT_FROM = 127.0.0.1; |
346 | ACCEPT_FROM6 = ::1; | 326 | ACCEPT_FROM6 = ::1; |
@@ -370,4 +350,4 @@ AUTOSTART = NO | |||
370 | AUTOSTART = NO | 350 | AUTOSTART = NO |
371 | 351 | ||
372 | [lockmanager] | 352 | [lockmanager] |
373 | AUTOSTART = NO \ No newline at end of file | 353 | AUTOSTART = NO |
diff --git a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf index 5081553c9..77dcd7427 100644 --- a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf +++ b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_bootstrap_server/ | 2 | SERVICEHOME = /tmp/c_bootstrap_server/ |
3 | DEFAULTCONFIG = confs/c_bootstrap_server_w_massif.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -11,7 +10,6 @@ AUTOSTART = YES | |||
11 | PORT = 0 | 10 | PORT = 0 |
12 | HOSTNAME = localhost | 11 | HOSTNAME = localhost |
13 | HOME = $SERVICEHOME | 12 | HOME = $SERVICEHOME |
14 | CONFIG = $DEFAULTCONFIG | ||
15 | BINARY = gnunet-service-dns | 13 | BINARY = gnunet-service-dns |
16 | ACCEPT_FROM = 127.0.0.1; | 14 | ACCEPT_FROM = 127.0.0.1; |
17 | ACCEPT_FROM6 = ::1; | 15 | ACCEPT_FROM6 = ::1; |
@@ -22,7 +20,6 @@ AUTOSTART = YES | |||
22 | PORT = 20017 | 20 | PORT = 20017 |
23 | HOSTNAME = localhost | 21 | HOSTNAME = localhost |
24 | HOME = $SERVICEHOME | 22 | HOME = $SERVICEHOME |
25 | CONFIG = $DEFAULTCONFIG | ||
26 | BINARY = gnunet-service-resolver | 23 | BINARY = gnunet-service-resolver |
27 | ACCEPT_FROM = 127.0.0.1; | 24 | ACCEPT_FROM = 127.0.0.1; |
28 | ACCEPT_FROM6 = ::1; | 25 | ACCEPT_FROM6 = ::1; |
@@ -35,7 +32,6 @@ AUTOSTART = YES | |||
35 | PORT = 20016 | 32 | PORT = 20016 |
36 | HOSTNAME = localhost | 33 | HOSTNAME = localhost |
37 | HOME = $SERVICEHOME | 34 | HOME = $SERVICEHOME |
38 | CONFIG = $DEFAULTCONFIG | ||
39 | BINARY = gnunet-service-mesh | 35 | BINARY = gnunet-service-mesh |
40 | ACCEPT_FROM = 127.0.0.1; | 36 | ACCEPT_FROM = 127.0.0.1; |
41 | ACCEPT_FROM6 = ::1; | 37 | ACCEPT_FROM6 = ::1; |
@@ -48,7 +44,6 @@ AUTOSTART = YES | |||
48 | PORT = 20015 | 44 | PORT = 20015 |
49 | HOSTNAME = localhost | 45 | HOSTNAME = localhost |
50 | HOME = $SERVICEHOME | 46 | HOME = $SERVICEHOME |
51 | CONFIG = $DEFAULTCONFIG | ||
52 | BINARY = gnunet-service-nse | 47 | BINARY = gnunet-service-nse |
53 | ACCEPT_FROM = 127.0.0.1; | 48 | ACCEPT_FROM = 127.0.0.1; |
54 | ACCEPT_FROM6 = ::1; | 49 | ACCEPT_FROM6 = ::1; |
@@ -67,7 +62,6 @@ FRIENDS-ONLY = NO | |||
67 | AUTOCONNECT = YES | 62 | AUTOCONNECT = YES |
68 | TARGET-CONNECTION-COUNT = 16 | 63 | TARGET-CONNECTION-COUNT = 16 |
69 | FRIENDS = $SERVICEHOME/friends | 64 | FRIENDS = $SERVICEHOME/friends |
70 | CONFIG = $DEFAULTCONFIG | ||
71 | BINARY = gnunet-daemon-topology | 65 | BINARY = gnunet-daemon-topology |
72 | 66 | ||
73 | [datastore] | 67 | [datastore] |
@@ -78,7 +72,6 @@ UNIX_MATCH_GID = YES | |||
78 | PORT = 20014 | 72 | PORT = 20014 |
79 | HOSTNAME = localhost | 73 | HOSTNAME = localhost |
80 | HOME = $SERVICEHOME | 74 | HOME = $SERVICEHOME |
81 | CONFIG = $DEFAULTCONFIG | ||
82 | BINARY = gnunet-service-datastore | 75 | BINARY = gnunet-service-datastore |
83 | ACCEPT_FROM = 127.0.0.1; | 76 | ACCEPT_FROM = 127.0.0.1; |
84 | ACCEPT_FROM6 = ::1; | 77 | ACCEPT_FROM6 = ::1; |
@@ -101,7 +94,6 @@ AUTOSTART = YES | |||
101 | PORT = 20013 | 94 | PORT = 20013 |
102 | HOSTNAME = localhost | 95 | HOSTNAME = localhost |
103 | HOME = $SERVICEHOME | 96 | HOME = $SERVICEHOME |
104 | CONFIG = $DEFAULTCONFIG | ||
105 | BINARY = gnunet-service-peerinfo | 97 | BINARY = gnunet-service-peerinfo |
106 | ACCEPT_FROM = 127.0.0.1; | 98 | ACCEPT_FROM = 127.0.0.1; |
107 | ACCEPT_FROM6 = ::1; | 99 | ACCEPT_FROM6 = ::1; |
@@ -125,7 +117,6 @@ AUTOSTART = YES | |||
125 | PORT = 20012 | 117 | PORT = 20012 |
126 | HOSTNAME = localhost | 118 | HOSTNAME = localhost |
127 | HOME = $SERVICEHOME | 119 | HOME = $SERVICEHOME |
128 | CONFIG = $DEFAULTCONFIG | ||
129 | BINARY = gnunet-service-ats | 120 | BINARY = gnunet-service-ats |
130 | ACCEPT_FROM = 127.0.0.1; | 121 | ACCEPT_FROM = 127.0.0.1; |
131 | ACCEPT_FROM6 = ::1; | 122 | ACCEPT_FROM6 = ::1; |
@@ -148,7 +139,6 @@ AUTOSTART = YES | |||
148 | PORT = 20011 | 139 | PORT = 20011 |
149 | HOSTNAME = localhost | 140 | HOSTNAME = localhost |
150 | HOME = $SERVICEHOME | 141 | HOME = $SERVICEHOME |
151 | CONFIG = $DEFAULTCONFIG | ||
152 | BINARY = gnunet-service-transport | 142 | BINARY = gnunet-service-transport |
153 | NEIGHBOUR_LIMIT = 50 | 143 | NEIGHBOUR_LIMIT = 50 |
154 | ACCEPT_FROM = 127.0.0.1; | 144 | ACCEPT_FROM = 127.0.0.1; |
@@ -200,7 +190,6 @@ AUTOSTART = NO | |||
200 | PORT = 20006 | 190 | PORT = 20006 |
201 | HOSTNAME = localhost | 191 | HOSTNAME = localhost |
202 | HOME = $SERVICEHOME | 192 | HOME = $SERVICEHOME |
203 | CONFIG = $DEFAULTCONFIG | ||
204 | BINARY = gnunet-service-template | 193 | BINARY = gnunet-service-template |
205 | ACCEPT_FROM = 127.0.0.1; | 194 | ACCEPT_FROM = 127.0.0.1; |
206 | ACCEPT_FROM6 = ::1; | 195 | ACCEPT_FROM6 = ::1; |
@@ -218,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
218 | PORT = 20005 | 207 | PORT = 20005 |
219 | HOSTNAME = localhost | 208 | HOSTNAME = localhost |
220 | HOME = $SERVICEHOME | 209 | HOME = $SERVICEHOME |
221 | CONFIG = $DEFAULTCONFIG | ||
222 | BINARY = gnunet-service-fs | 210 | BINARY = gnunet-service-fs |
223 | ACCEPT_FROM = 127.0.0.1; | 211 | ACCEPT_FROM = 127.0.0.1; |
224 | ACCEPT_FROM6 = ::1; | 212 | ACCEPT_FROM6 = ::1; |
@@ -233,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
233 | EXPECTED_NEIGHBOUR_COUNT = 128 | 221 | EXPECTED_NEIGHBOUR_COUNT = 128 |
234 | 222 | ||
235 | [vpn] | 223 | [vpn] |
236 | CONFIG = $DEFAULTCONFIG | ||
237 | BINARY = gnunet-daemon-vpn | 224 | BINARY = gnunet-daemon-vpn |
238 | IPV6ADDR = 1234::1 | 225 | IPV6ADDR = 1234::1 |
239 | IPV6PREFIX = 32 | 226 | IPV6PREFIX = 32 |
@@ -244,7 +231,6 @@ VIRTDNS6 = 1234::17 | |||
244 | IFNAME = vpn-gnunet | 231 | IFNAME = vpn-gnunet |
245 | 232 | ||
246 | [exit] | 233 | [exit] |
247 | CONFIG = $DEFAULTCONFIG | ||
248 | BINARY = gnunet-daemon-exit | 234 | BINARY = gnunet-daemon-exit |
249 | IPV6ADDR = 1234:1::1 | 235 | IPV6ADDR = 1234:1::1 |
250 | IPV6PREFIX = 32 | 236 | IPV6PREFIX = 32 |
@@ -259,7 +245,6 @@ AUTOSTART = YES | |||
259 | PORT = 0 | 245 | PORT = 0 |
260 | HOSTNAME = localhost | 246 | HOSTNAME = localhost |
261 | HOME = $SERVICEHOME | 247 | HOME = $SERVICEHOME |
262 | CONFIG = $DEFAULTCONFIG | ||
263 | BINARY = gnunet-service-dns | 248 | BINARY = gnunet-service-dns |
264 | ACCEPT_FROM = 127.0.0.1; | 249 | ACCEPT_FROM = 127.0.0.1; |
265 | ACCEPT_FROM6 = ::1; | 250 | ACCEPT_FROM6 = ::1; |
@@ -270,7 +255,6 @@ PROVIDE_EXIT = NO | |||
270 | PORT = 20004 | 255 | PORT = 20004 |
271 | HOSTNAME = localhost | 256 | HOSTNAME = localhost |
272 | HOME = $SERVICEHOME | 257 | HOME = $SERVICEHOME |
273 | CONFIG = $DEFAULTCONFIG | ||
274 | BINARY = gnunet-service-arm | 258 | BINARY = gnunet-service-arm |
275 | ACCEPT_FROM = 127.0.0.1; | 259 | ACCEPT_FROM = 127.0.0.1; |
276 | ACCEPT_FROM6 = ::1; | 260 | ACCEPT_FROM6 = ::1; |
@@ -283,7 +267,6 @@ UNIX_MATCH_GID = YES | |||
283 | HTTPPORT = 8080 | 267 | HTTPPORT = 8080 |
284 | HOME = $SERVICEHOME | 268 | HOME = $SERVICEHOME |
285 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 269 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
286 | CONFIG = $DEFAULTCONFIG | ||
287 | BINARY = gnunet-daemon-hostlist | 270 | BINARY = gnunet-daemon-hostlist |
288 | OPTIONS = -p | 271 | OPTIONS = -p |
289 | #SERVERS = http://v9.gnunet.org:58080/ | 272 | #SERVERS = http://v9.gnunet.org:58080/ |
@@ -294,7 +277,6 @@ AUTOSTART = YES | |||
294 | PORT = 20003 | 277 | PORT = 20003 |
295 | HOSTNAME = localhost | 278 | HOSTNAME = localhost |
296 | HOME = $SERVICEHOME | 279 | HOME = $SERVICEHOME |
297 | CONFIG = $DEFAULTCONFIG | ||
298 | BINARY = gnunet-service-core | 280 | BINARY = gnunet-service-core |
299 | ACCEPT_FROM = 127.0.0.1; | 281 | ACCEPT_FROM = 127.0.0.1; |
300 | ACCEPT_FROM6 = ::1; | 282 | ACCEPT_FROM6 = ::1; |
@@ -328,7 +310,6 @@ AUTOSTART = YES | |||
328 | PORT = 20001 | 310 | PORT = 20001 |
329 | HOSTNAME = localhost | 311 | HOSTNAME = localhost |
330 | HOME = $SERVICEHOME | 312 | HOME = $SERVICEHOME |
331 | CONFIG = $DEFAULTCONFIG | ||
332 | BINARY = gnunet-service-statistics | 313 | BINARY = gnunet-service-statistics |
333 | ACCEPT_FROM = 127.0.0.1; | 314 | ACCEPT_FROM = 127.0.0.1; |
334 | ACCEPT_FROM6 = ::1; | 315 | ACCEPT_FROM6 = ::1; |
@@ -341,7 +322,6 @@ AUTOSTART = YES | |||
341 | PORT = 20000 | 322 | PORT = 20000 |
342 | HOSTNAME = localhost | 323 | HOSTNAME = localhost |
343 | HOME = $SERVICEHOME | 324 | HOME = $SERVICEHOME |
344 | CONFIG = $DEFAULTCONFIG | ||
345 | BINARY = gnunet-service-dht | 325 | BINARY = gnunet-service-dht |
346 | ACCEPT_FROM = 127.0.0.1; | 326 | ACCEPT_FROM = 127.0.0.1; |
347 | ACCEPT_FROM6 = ::1; | 327 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf index 9e12bb9fa..ffba6d560 100644 --- a/src/integration-tests/confs/c_nat_client.conf +++ b/src/integration-tests/confs/c_nat_client.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_nat_client | 2 | SERVICEHOME = /tmp/c_nat_client |
3 | DEFAULTCONFIG = confs/c_nat_client.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = hostkeys/0002-hostkey | 5 | HOSTKEY = hostkeys/0002-hostkey |
@@ -19,7 +18,6 @@ AUTOSTART = YES | |||
19 | PORT = 0 | 18 | PORT = 0 |
20 | HOSTNAME = localhost | 19 | HOSTNAME = localhost |
21 | HOME = $SERVICEHOME | 20 | HOME = $SERVICEHOME |
22 | CONFIG = $DEFAULTCONFIG | ||
23 | BINARY = gnunet-service-dns | 21 | BINARY = gnunet-service-dns |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | ACCEPT_FROM6 = ::1; | 23 | ACCEPT_FROM6 = ::1; |
@@ -31,7 +29,6 @@ AUTOSTART = YES | |||
31 | PORT = 20071 | 29 | PORT = 20071 |
32 | HOSTNAME = localhost | 30 | HOSTNAME = localhost |
33 | HOME = $SERVICEHOME | 31 | HOME = $SERVICEHOME |
34 | CONFIG = $DEFAULTCONFIG | ||
35 | BINARY = gnunet-service-resolver | 32 | BINARY = gnunet-service-resolver |
36 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
37 | ACCEPT_FROM6 = ::1; | 34 | ACCEPT_FROM6 = ::1; |
@@ -44,7 +41,6 @@ AUTOSTART = YES | |||
44 | PORT = 20070 | 41 | PORT = 20070 |
45 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
46 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
47 | CONFIG = $DEFAULTCONFIG | ||
48 | BINARY = gnunet-service-mesh | 44 | BINARY = gnunet-service-mesh |
49 | ACCEPT_FROM = 127.0.0.1; | 45 | ACCEPT_FROM = 127.0.0.1; |
50 | ACCEPT_FROM6 = ::1; | 46 | ACCEPT_FROM6 = ::1; |
@@ -57,7 +53,6 @@ AUTOSTART = YES | |||
57 | PORT = 20069 | 53 | PORT = 20069 |
58 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
59 | HOME = $SERVICEHOME | 55 | HOME = $SERVICEHOME |
60 | CONFIG = $DEFAULTCONFIG | ||
61 | BINARY = gnunet-service-nse | 56 | BINARY = gnunet-service-nse |
62 | ACCEPT_FROM = 127.0.0.1; | 57 | ACCEPT_FROM = 127.0.0.1; |
63 | ACCEPT_FROM6 = ::1; | 58 | ACCEPT_FROM6 = ::1; |
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO | |||
76 | AUTOCONNECT = YES | 71 | AUTOCONNECT = YES |
77 | TARGET-CONNECTION-COUNT = 16 | 72 | TARGET-CONNECTION-COUNT = 16 |
78 | FRIENDS = $SERVICEHOME/friends | 73 | FRIENDS = $SERVICEHOME/friends |
79 | CONFIG = $DEFAULTCONFIG | ||
80 | BINARY = gnunet-daemon-topology | 74 | BINARY = gnunet-daemon-topology |
81 | 75 | ||
82 | [datastore] | 76 | [datastore] |
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES | |||
87 | PORT = 20068 | 81 | PORT = 20068 |
88 | HOSTNAME = localhost | 82 | HOSTNAME = localhost |
89 | HOME = $SERVICEHOME | 83 | HOME = $SERVICEHOME |
90 | CONFIG = $DEFAULTCONFIG | ||
91 | BINARY = gnunet-service-datastore | 84 | BINARY = gnunet-service-datastore |
92 | ACCEPT_FROM = 127.0.0.1; | 85 | ACCEPT_FROM = 127.0.0.1; |
93 | ACCEPT_FROM6 = ::1; | 86 | ACCEPT_FROM6 = ::1; |
@@ -110,7 +103,6 @@ AUTOSTART = YES | |||
110 | PORT = 20067 | 103 | PORT = 20067 |
111 | HOSTNAME = localhost | 104 | HOSTNAME = localhost |
112 | HOME = $SERVICEHOME | 105 | HOME = $SERVICEHOME |
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-peerinfo | 106 | BINARY = gnunet-service-peerinfo |
115 | ACCEPT_FROM = 127.0.0.1; | 107 | ACCEPT_FROM = 127.0.0.1; |
116 | ACCEPT_FROM6 = ::1; | 108 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20066 | 123 | PORT = 20066 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -153,7 +144,6 @@ AUTOSTART = YES | |||
153 | PORT = 20065 | 144 | PORT = 20065 |
154 | HOSTNAME = localhost | 145 | HOSTNAME = localhost |
155 | HOME = $SERVICEHOME | 146 | HOME = $SERVICEHOME |
156 | CONFIG = $DEFAULTCONFIG | ||
157 | BINARY = gnunet-service-transport | 147 | BINARY = gnunet-service-transport |
158 | NEIGHBOUR_LIMIT = 50 | 148 | NEIGHBOUR_LIMIT = 50 |
159 | ACCEPT_FROM = 127.0.0.1; | 149 | ACCEPT_FROM = 127.0.0.1; |
@@ -205,7 +195,6 @@ AUTOSTART = NO | |||
205 | PORT = 20060 | 195 | PORT = 20060 |
206 | HOSTNAME = localhost | 196 | HOSTNAME = localhost |
207 | HOME = $SERVICEHOME | 197 | HOME = $SERVICEHOME |
208 | CONFIG = $DEFAULTCONFIG | ||
209 | BINARY = gnunet-service-template | 198 | BINARY = gnunet-service-template |
210 | ACCEPT_FROM = 127.0.0.1; | 199 | ACCEPT_FROM = 127.0.0.1; |
211 | ACCEPT_FROM6 = ::1; | 200 | ACCEPT_FROM6 = ::1; |
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
223 | PORT = 20059 | 212 | PORT = 20059 |
224 | HOSTNAME = localhost | 213 | HOSTNAME = localhost |
225 | HOME = $SERVICEHOME | 214 | HOME = $SERVICEHOME |
226 | CONFIG = $DEFAULTCONFIG | ||
227 | BINARY = gnunet-service-fs | 215 | BINARY = gnunet-service-fs |
228 | ACCEPT_FROM = 127.0.0.1; | 216 | ACCEPT_FROM = 127.0.0.1; |
229 | ACCEPT_FROM6 = ::1; | 217 | ACCEPT_FROM6 = ::1; |
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
238 | EXPECTED_NEIGHBOUR_COUNT = 128 | 226 | EXPECTED_NEIGHBOUR_COUNT = 128 |
239 | 227 | ||
240 | [vpn] | 228 | [vpn] |
241 | CONFIG = $DEFAULTCONFIG | ||
242 | BINARY = gnunet-daemon-vpn | 229 | BINARY = gnunet-daemon-vpn |
243 | IPV6ADDR = 1234::1 | 230 | IPV6ADDR = 1234::1 |
244 | IPV6PREFIX = 32 | 231 | IPV6PREFIX = 32 |
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 | |||
249 | IFNAME = vpn-gnunet | 236 | IFNAME = vpn-gnunet |
250 | 237 | ||
251 | [exit] | 238 | [exit] |
252 | CONFIG = $DEFAULTCONFIG | ||
253 | BINARY = gnunet-daemon-exit | 239 | BINARY = gnunet-daemon-exit |
254 | IPV6ADDR = 1234:1::1 | 240 | IPV6ADDR = 1234:1::1 |
255 | IPV6PREFIX = 32 | 241 | IPV6PREFIX = 32 |
@@ -264,7 +250,6 @@ AUTOSTART = YES | |||
264 | PORT = 0 | 250 | PORT = 0 |
265 | HOSTNAME = localhost | 251 | HOSTNAME = localhost |
266 | HOME = $SERVICEHOME | 252 | HOME = $SERVICEHOME |
267 | CONFIG = $DEFAULTCONFIG | ||
268 | BINARY = gnunet-service-dns | 253 | BINARY = gnunet-service-dns |
269 | ACCEPT_FROM = 127.0.0.1; | 254 | ACCEPT_FROM = 127.0.0.1; |
270 | ACCEPT_FROM6 = ::1; | 255 | ACCEPT_FROM6 = ::1; |
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO | |||
275 | PORT = 20058 | 260 | PORT = 20058 |
276 | HOSTNAME = localhost | 261 | HOSTNAME = localhost |
277 | HOME = $SERVICEHOME | 262 | HOME = $SERVICEHOME |
278 | CONFIG = $DEFAULTCONFIG | ||
279 | BINARY = gnunet-service-arm | 263 | BINARY = gnunet-service-arm |
280 | ACCEPT_FROM = 127.0.0.1; | 264 | ACCEPT_FROM = 127.0.0.1; |
281 | ACCEPT_FROM6 = ::1; | 265 | ACCEPT_FROM6 = ::1; |
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES | |||
288 | HTTPPORT = 8080 | 272 | HTTPPORT = 8080 |
289 | HOME = $SERVICEHOME | 273 | HOME = $SERVICEHOME |
290 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 274 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
291 | CONFIG = $DEFAULTCONFIG | ||
292 | BINARY = gnunet-daemon-hostlist | 275 | BINARY = gnunet-daemon-hostlist |
293 | OPTIONS = -b | 276 | OPTIONS = -b |
294 | SERVERS = http://localhost:8080/ | 277 | SERVERS = http://localhost:8080/ |
@@ -299,7 +282,6 @@ AUTOSTART = YES | |||
299 | PORT = 20057 | 282 | PORT = 20057 |
300 | HOSTNAME = localhost | 283 | HOSTNAME = localhost |
301 | HOME = $SERVICEHOME | 284 | HOME = $SERVICEHOME |
302 | CONFIG = $DEFAULTCONFIG | ||
303 | BINARY = gnunet-service-core | 285 | BINARY = gnunet-service-core |
304 | ACCEPT_FROM = 127.0.0.1; | 286 | ACCEPT_FROM = 127.0.0.1; |
305 | ACCEPT_FROM6 = ::1; | 287 | ACCEPT_FROM6 = ::1; |
@@ -333,7 +315,6 @@ AUTOSTART = YES | |||
333 | PORT = 20055 | 315 | PORT = 20055 |
334 | HOSTNAME = localhost | 316 | HOSTNAME = localhost |
335 | HOME = $SERVICEHOME | 317 | HOME = $SERVICEHOME |
336 | CONFIG = $DEFAULTCONFIG | ||
337 | BINARY = gnunet-service-statistics | 318 | BINARY = gnunet-service-statistics |
338 | ACCEPT_FROM = 127.0.0.1; | 319 | ACCEPT_FROM = 127.0.0.1; |
339 | ACCEPT_FROM6 = ::1; | 320 | ACCEPT_FROM6 = ::1; |
@@ -346,7 +327,6 @@ AUTOSTART = YES | |||
346 | PORT = 20054 | 327 | PORT = 20054 |
347 | HOSTNAME = localhost | 328 | HOSTNAME = localhost |
348 | HOME = $SERVICEHOME | 329 | HOME = $SERVICEHOME |
349 | CONFIG = $DEFAULTCONFIG | ||
350 | BINARY = gnunet-service-dht | 330 | BINARY = gnunet-service-dht |
351 | ACCEPT_FROM = 127.0.0.1; | 331 | ACCEPT_FROM = 127.0.0.1; |
352 | ACCEPT_FROM6 = ::1; | 332 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index e3c30f783..8d4c7e3e8 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client/ | 2 | SERVICEHOME = /tmp/c_no_nat_client/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -17,7 +16,6 @@ AUTOSTART = YES | |||
17 | PORT = 0 | 16 | PORT = 0 |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | HOME = $SERVICEHOME | 18 | HOME = $SERVICEHOME |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | BINARY = gnunet-service-dns | 19 | BINARY = gnunet-service-dns |
22 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
@@ -28,7 +26,6 @@ AUTOSTART = YES | |||
28 | PORT = 20035 | 26 | PORT = 20035 |
29 | HOSTNAME = localhost | 27 | HOSTNAME = localhost |
30 | HOME = $SERVICEHOME | 28 | HOME = $SERVICEHOME |
31 | CONFIG = $DEFAULTCONFIG | ||
32 | BINARY = gnunet-service-resolver | 29 | BINARY = gnunet-service-resolver |
33 | ACCEPT_FROM = 127.0.0.1; | 30 | ACCEPT_FROM = 127.0.0.1; |
34 | ACCEPT_FROM6 = ::1; | 31 | ACCEPT_FROM6 = ::1; |
@@ -41,7 +38,6 @@ AUTOSTART = YES | |||
41 | PORT = 20034 | 38 | PORT = 20034 |
42 | HOSTNAME = localhost | 39 | HOSTNAME = localhost |
43 | HOME = $SERVICEHOME | 40 | HOME = $SERVICEHOME |
44 | CONFIG = $DEFAULTCONFIG | ||
45 | BINARY = gnunet-service-mesh | 41 | BINARY = gnunet-service-mesh |
46 | ACCEPT_FROM = 127.0.0.1; | 42 | ACCEPT_FROM = 127.0.0.1; |
47 | ACCEPT_FROM6 = ::1; | 43 | ACCEPT_FROM6 = ::1; |
@@ -54,7 +50,6 @@ AUTOSTART = YES | |||
54 | PORT = 20033 | 50 | PORT = 20033 |
55 | HOSTNAME = localhost | 51 | HOSTNAME = localhost |
56 | HOME = $SERVICEHOME | 52 | HOME = $SERVICEHOME |
57 | CONFIG = $DEFAULTCONFIG | ||
58 | BINARY = gnunet-service-nse | 53 | BINARY = gnunet-service-nse |
59 | ACCEPT_FROM = 127.0.0.1; | 54 | ACCEPT_FROM = 127.0.0.1; |
60 | ACCEPT_FROM6 = ::1; | 55 | ACCEPT_FROM6 = ::1; |
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO | |||
73 | AUTOCONNECT = YES | 68 | AUTOCONNECT = YES |
74 | TARGET-CONNECTION-COUNT = 16 | 69 | TARGET-CONNECTION-COUNT = 16 |
75 | FRIENDS = $SERVICEHOME/friends | 70 | FRIENDS = $SERVICEHOME/friends |
76 | CONFIG = $DEFAULTCONFIG | ||
77 | BINARY = gnunet-daemon-topology | 71 | BINARY = gnunet-daemon-topology |
78 | 72 | ||
79 | [datastore] | 73 | [datastore] |
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES | |||
84 | PORT = 20032 | 78 | PORT = 20032 |
85 | HOSTNAME = localhost | 79 | HOSTNAME = localhost |
86 | HOME = $SERVICEHOME | 80 | HOME = $SERVICEHOME |
87 | CONFIG = $DEFAULTCONFIG | ||
88 | BINARY = gnunet-service-datastore | 81 | BINARY = gnunet-service-datastore |
89 | ACCEPT_FROM = 127.0.0.1; | 82 | ACCEPT_FROM = 127.0.0.1; |
90 | ACCEPT_FROM6 = ::1; | 83 | ACCEPT_FROM6 = ::1; |
@@ -107,7 +100,6 @@ AUTOSTART = YES | |||
107 | PORT = 20031 | 100 | PORT = 20031 |
108 | HOSTNAME = localhost | 101 | HOSTNAME = localhost |
109 | HOME = $SERVICEHOME | 102 | HOME = $SERVICEHOME |
110 | CONFIG = $DEFAULTCONFIG | ||
111 | BINARY = gnunet-service-peerinfo | 103 | BINARY = gnunet-service-peerinfo |
112 | ACCEPT_FROM = 127.0.0.1; | 104 | ACCEPT_FROM = 127.0.0.1; |
113 | ACCEPT_FROM6 = ::1; | 105 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20030 | 123 | PORT = 20030 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -155,7 +146,6 @@ AUTOSTART = YES | |||
155 | PORT = 20029 | 146 | PORT = 20029 |
156 | HOSTNAME = localhost | 147 | HOSTNAME = localhost |
157 | HOME = $SERVICEHOME | 148 | HOME = $SERVICEHOME |
158 | CONFIG = $DEFAULTCONFIG | ||
159 | BINARY = gnunet-service-transport | 149 | BINARY = gnunet-service-transport |
160 | NEIGHBOUR_LIMIT = 50 | 150 | NEIGHBOUR_LIMIT = 50 |
161 | ACCEPT_FROM = 127.0.0.1; | 151 | ACCEPT_FROM = 127.0.0.1; |
@@ -207,7 +197,6 @@ AUTOSTART = NO | |||
207 | PORT = 20024 | 197 | PORT = 20024 |
208 | HOSTNAME = localhost | 198 | HOSTNAME = localhost |
209 | HOME = $SERVICEHOME | 199 | HOME = $SERVICEHOME |
210 | CONFIG = $DEFAULTCONFIG | ||
211 | BINARY = gnunet-service-template | 200 | BINARY = gnunet-service-template |
212 | ACCEPT_FROM = 127.0.0.1; | 201 | ACCEPT_FROM = 127.0.0.1; |
213 | ACCEPT_FROM6 = ::1; | 202 | ACCEPT_FROM6 = ::1; |
@@ -225,7 +214,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
225 | PORT = 20023 | 214 | PORT = 20023 |
226 | HOSTNAME = localhost | 215 | HOSTNAME = localhost |
227 | HOME = $SERVICEHOME | 216 | HOME = $SERVICEHOME |
228 | CONFIG = $DEFAULTCONFIG | ||
229 | BINARY = gnunet-service-fs | 217 | BINARY = gnunet-service-fs |
230 | ACCEPT_FROM = 127.0.0.1; | 218 | ACCEPT_FROM = 127.0.0.1; |
231 | ACCEPT_FROM6 = ::1; | 219 | ACCEPT_FROM6 = ::1; |
@@ -240,7 +228,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
240 | EXPECTED_NEIGHBOUR_COUNT = 128 | 228 | EXPECTED_NEIGHBOUR_COUNT = 128 |
241 | 229 | ||
242 | [vpn] | 230 | [vpn] |
243 | CONFIG = $DEFAULTCONFIG | ||
244 | BINARY = gnunet-daemon-vpn | 231 | BINARY = gnunet-daemon-vpn |
245 | IPV6ADDR = 1234::1 | 232 | IPV6ADDR = 1234::1 |
246 | IPV6PREFIX = 32 | 233 | IPV6PREFIX = 32 |
@@ -251,7 +238,6 @@ VIRTDNS6 = 1234::17 | |||
251 | IFNAME = vpn-gnunet | 238 | IFNAME = vpn-gnunet |
252 | 239 | ||
253 | [exit] | 240 | [exit] |
254 | CONFIG = $DEFAULTCONFIG | ||
255 | BINARY = gnunet-daemon-exit | 241 | BINARY = gnunet-daemon-exit |
256 | IPV6ADDR = 1234:1::1 | 242 | IPV6ADDR = 1234:1::1 |
257 | IPV6PREFIX = 32 | 243 | IPV6PREFIX = 32 |
@@ -266,7 +252,6 @@ AUTOSTART = YES | |||
266 | PORT = 0 | 252 | PORT = 0 |
267 | HOSTNAME = localhost | 253 | HOSTNAME = localhost |
268 | HOME = $SERVICEHOME | 254 | HOME = $SERVICEHOME |
269 | CONFIG = $DEFAULTCONFIG | ||
270 | BINARY = gnunet-service-dns | 255 | BINARY = gnunet-service-dns |
271 | ACCEPT_FROM = 127.0.0.1; | 256 | ACCEPT_FROM = 127.0.0.1; |
272 | ACCEPT_FROM6 = ::1; | 257 | ACCEPT_FROM6 = ::1; |
@@ -277,7 +262,6 @@ PROVIDE_EXIT = NO | |||
277 | PORT = 20022 | 262 | PORT = 20022 |
278 | HOSTNAME = localhost | 263 | HOSTNAME = localhost |
279 | HOME = $SERVICEHOME | 264 | HOME = $SERVICEHOME |
280 | CONFIG = $DEFAULTCONFIG | ||
281 | BINARY = gnunet-service-arm | 265 | BINARY = gnunet-service-arm |
282 | ACCEPT_FROM = 127.0.0.1; | 266 | ACCEPT_FROM = 127.0.0.1; |
283 | ACCEPT_FROM6 = ::1; | 267 | ACCEPT_FROM6 = ::1; |
@@ -290,7 +274,6 @@ UNIX_MATCH_GID = YES | |||
290 | HTTPPORT = 8080 | 274 | HTTPPORT = 8080 |
291 | HOME = $SERVICEHOME | 275 | HOME = $SERVICEHOME |
292 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 276 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
293 | CONFIG = $DEFAULTCONFIG | ||
294 | BINARY = gnunet-daemon-hostlist | 277 | BINARY = gnunet-daemon-hostlist |
295 | OPTIONS = -b | 278 | OPTIONS = -b |
296 | SERVERS = http://localhost:8080/ | 279 | SERVERS = http://localhost:8080/ |
@@ -301,7 +284,6 @@ AUTOSTART = YES | |||
301 | PORT = 20021 | 284 | PORT = 20021 |
302 | HOSTNAME = localhost | 285 | HOSTNAME = localhost |
303 | HOME = $SERVICEHOME | 286 | HOME = $SERVICEHOME |
304 | CONFIG = $DEFAULTCONFIG | ||
305 | BINARY = gnunet-service-core | 287 | BINARY = gnunet-service-core |
306 | ACCEPT_FROM = 127.0.0.1; | 288 | ACCEPT_FROM = 127.0.0.1; |
307 | ACCEPT_FROM6 = ::1; | 289 | ACCEPT_FROM6 = ::1; |
@@ -335,7 +317,6 @@ AUTOSTART = YES | |||
335 | PORT = 20019 | 317 | PORT = 20019 |
336 | HOSTNAME = localhost | 318 | HOSTNAME = localhost |
337 | HOME = $SERVICEHOME | 319 | HOME = $SERVICEHOME |
338 | CONFIG = $DEFAULTCONFIG | ||
339 | BINARY = gnunet-service-statistics | 320 | BINARY = gnunet-service-statistics |
340 | ACCEPT_FROM = 127.0.0.1; | 321 | ACCEPT_FROM = 127.0.0.1; |
341 | ACCEPT_FROM6 = ::1; | 322 | ACCEPT_FROM6 = ::1; |
@@ -348,7 +329,6 @@ AUTOSTART = YES | |||
348 | PORT = 20018 | 329 | PORT = 20018 |
349 | HOSTNAME = localhost | 330 | HOSTNAME = localhost |
350 | HOME = $SERVICEHOME | 331 | HOME = $SERVICEHOME |
351 | CONFIG = $DEFAULTCONFIG | ||
352 | BINARY = gnunet-service-dht | 332 | BINARY = gnunet-service-dht |
353 | ACCEPT_FROM = 127.0.0.1; | 333 | ACCEPT_FROM = 127.0.0.1; |
354 | ACCEPT_FROM6 = ::1; | 334 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf index 2ea3a9f6d..96d391b3d 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client_2/ | 2 | SERVICEHOME = /tmp/c_no_nat_client_2/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client_2.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -11,7 +10,6 @@ AUTOSTART = YES | |||
11 | PORT = 20053 | 10 | PORT = 20053 |
12 | HOSTNAME = localhost | 11 | HOSTNAME = localhost |
13 | HOME = $SERVICEHOME | 12 | HOME = $SERVICEHOME |
14 | CONFIG = $DEFAULTCONFIG | ||
15 | BINARY = gnunet-service-resolver | 13 | BINARY = gnunet-service-resolver |
16 | ACCEPT_FROM = 127.0.0.1; | 14 | ACCEPT_FROM = 127.0.0.1; |
17 | ACCEPT_FROM6 = ::1; | 15 | ACCEPT_FROM6 = ::1; |
@@ -24,7 +22,6 @@ AUTOSTART = YES | |||
24 | PORT = 20052 | 22 | PORT = 20052 |
25 | HOSTNAME = localhost | 23 | HOSTNAME = localhost |
26 | HOME = $SERVICEHOME | 24 | HOME = $SERVICEHOME |
27 | CONFIG = $DEFAULTCONFIG | ||
28 | BINARY = gnunet-service-mesh | 25 | BINARY = gnunet-service-mesh |
29 | ACCEPT_FROM = 127.0.0.1; | 26 | ACCEPT_FROM = 127.0.0.1; |
30 | ACCEPT_FROM6 = ::1; | 27 | ACCEPT_FROM6 = ::1; |
@@ -37,7 +34,6 @@ AUTOSTART = YES | |||
37 | PORT = 20051 | 34 | PORT = 20051 |
38 | HOSTNAME = localhost | 35 | HOSTNAME = localhost |
39 | HOME = $SERVICEHOME | 36 | HOME = $SERVICEHOME |
40 | CONFIG = $DEFAULTCONFIG | ||
41 | BINARY = gnunet-service-nse | 37 | BINARY = gnunet-service-nse |
42 | ACCEPT_FROM = 127.0.0.1; | 38 | ACCEPT_FROM = 127.0.0.1; |
43 | ACCEPT_FROM6 = ::1; | 39 | ACCEPT_FROM6 = ::1; |
@@ -56,7 +52,6 @@ FRIENDS-ONLY = NO | |||
56 | AUTOCONNECT = YES | 52 | AUTOCONNECT = YES |
57 | TARGET-CONNECTION-COUNT = 16 | 53 | TARGET-CONNECTION-COUNT = 16 |
58 | FRIENDS = $SERVICEHOME/friends | 54 | FRIENDS = $SERVICEHOME/friends |
59 | CONFIG = $DEFAULTCONFIG | ||
60 | BINARY = gnunet-daemon-topology | 55 | BINARY = gnunet-daemon-topology |
61 | 56 | ||
62 | [datastore] | 57 | [datastore] |
@@ -67,7 +62,6 @@ UNIX_MATCH_GID = YES | |||
67 | PORT = 20050 | 62 | PORT = 20050 |
68 | HOSTNAME = localhost | 63 | HOSTNAME = localhost |
69 | HOME = $SERVICEHOME | 64 | HOME = $SERVICEHOME |
70 | CONFIG = $DEFAULTCONFIG | ||
71 | BINARY = gnunet-service-datastore | 65 | BINARY = gnunet-service-datastore |
72 | ACCEPT_FROM = 127.0.0.1; | 66 | ACCEPT_FROM = 127.0.0.1; |
73 | ACCEPT_FROM6 = ::1; | 67 | ACCEPT_FROM6 = ::1; |
@@ -90,7 +84,6 @@ AUTOSTART = YES | |||
90 | PORT = 20049 | 84 | PORT = 20049 |
91 | HOSTNAME = localhost | 85 | HOSTNAME = localhost |
92 | HOME = $SERVICEHOME | 86 | HOME = $SERVICEHOME |
93 | CONFIG = $DEFAULTCONFIG | ||
94 | BINARY = gnunet-service-peerinfo | 87 | BINARY = gnunet-service-peerinfo |
95 | ACCEPT_FROM = 127.0.0.1; | 88 | ACCEPT_FROM = 127.0.0.1; |
96 | ACCEPT_FROM6 = ::1; | 89 | ACCEPT_FROM6 = ::1; |
@@ -114,7 +107,6 @@ AUTOSTART = YES | |||
114 | PORT = 20048 | 107 | PORT = 20048 |
115 | HOSTNAME = localhost | 108 | HOSTNAME = localhost |
116 | HOME = $SERVICEHOME | 109 | HOME = $SERVICEHOME |
117 | CONFIG = $DEFAULTCONFIG | ||
118 | BINARY = gnunet-service-ats | 110 | BINARY = gnunet-service-ats |
119 | ACCEPT_FROM = 127.0.0.1; | 111 | ACCEPT_FROM = 127.0.0.1; |
120 | ACCEPT_FROM6 = ::1; | 112 | ACCEPT_FROM6 = ::1; |
@@ -136,7 +128,6 @@ AUTOSTART = YES | |||
136 | PORT = 20047 | 128 | PORT = 20047 |
137 | HOSTNAME = localhost | 129 | HOSTNAME = localhost |
138 | HOME = $SERVICEHOME | 130 | HOME = $SERVICEHOME |
139 | CONFIG = $DEFAULTCONFIG | ||
140 | BINARY = gnunet-service-transport | 131 | BINARY = gnunet-service-transport |
141 | NEIGHBOUR_LIMIT = 50 | 132 | NEIGHBOUR_LIMIT = 50 |
142 | ACCEPT_FROM = 127.0.0.1; | 133 | ACCEPT_FROM = 127.0.0.1; |
@@ -188,7 +179,6 @@ AUTOSTART = NO | |||
188 | PORT = 20042 | 179 | PORT = 20042 |
189 | HOSTNAME = localhost | 180 | HOSTNAME = localhost |
190 | HOME = $SERVICEHOME | 181 | HOME = $SERVICEHOME |
191 | CONFIG = $DEFAULTCONFIG | ||
192 | BINARY = gnunet-service-template | 182 | BINARY = gnunet-service-template |
193 | ACCEPT_FROM = 127.0.0.1; | 183 | ACCEPT_FROM = 127.0.0.1; |
194 | ACCEPT_FROM6 = ::1; | 184 | ACCEPT_FROM6 = ::1; |
@@ -206,7 +196,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
206 | PORT = 20041 | 196 | PORT = 20041 |
207 | HOSTNAME = localhost | 197 | HOSTNAME = localhost |
208 | HOME = $SERVICEHOME | 198 | HOME = $SERVICEHOME |
209 | CONFIG = $DEFAULTCONFIG | ||
210 | BINARY = gnunet-service-fs | 199 | BINARY = gnunet-service-fs |
211 | ACCEPT_FROM = 127.0.0.1; | 200 | ACCEPT_FROM = 127.0.0.1; |
212 | ACCEPT_FROM6 = ::1; | 201 | ACCEPT_FROM6 = ::1; |
@@ -221,7 +210,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
221 | EXPECTED_NEIGHBOUR_COUNT = 128 | 210 | EXPECTED_NEIGHBOUR_COUNT = 128 |
222 | 211 | ||
223 | [vpn] | 212 | [vpn] |
224 | CONFIG = $DEFAULTCONFIG | ||
225 | BINARY = gnunet-daemon-vpn | 213 | BINARY = gnunet-daemon-vpn |
226 | IPV6ADDR = 1234::1 | 214 | IPV6ADDR = 1234::1 |
227 | IPV6PREFIX = 32 | 215 | IPV6PREFIX = 32 |
@@ -232,7 +220,6 @@ VIRTDNS6 = 1234::17 | |||
232 | IFNAME = vpn-gnunet | 220 | IFNAME = vpn-gnunet |
233 | 221 | ||
234 | [exit] | 222 | [exit] |
235 | CONFIG = $DEFAULTCONFIG | ||
236 | BINARY = gnunet-daemon-exit | 223 | BINARY = gnunet-daemon-exit |
237 | IPV6ADDR = 1234:1::1 | 224 | IPV6ADDR = 1234:1::1 |
238 | IPV6PREFIX = 32 | 225 | IPV6PREFIX = 32 |
@@ -247,7 +234,6 @@ AUTOSTART = YES | |||
247 | PORT = 0 | 234 | PORT = 0 |
248 | HOSTNAME = localhost | 235 | HOSTNAME = localhost |
249 | HOME = $SERVICEHOME | 236 | HOME = $SERVICEHOME |
250 | CONFIG = $DEFAULTCONFIG | ||
251 | BINARY = gnunet-service-dns | 237 | BINARY = gnunet-service-dns |
252 | ACCEPT_FROM = 127.0.0.1; | 238 | ACCEPT_FROM = 127.0.0.1; |
253 | ACCEPT_FROM6 = ::1; | 239 | ACCEPT_FROM6 = ::1; |
@@ -258,7 +244,6 @@ PROVIDE_EXIT = NO | |||
258 | PORT = 20040 | 244 | PORT = 20040 |
259 | HOSTNAME = localhost | 245 | HOSTNAME = localhost |
260 | HOME = $SERVICEHOME | 246 | HOME = $SERVICEHOME |
261 | CONFIG = $DEFAULTCONFIG | ||
262 | BINARY = gnunet-service-arm | 247 | BINARY = gnunet-service-arm |
263 | ACCEPT_FROM = 127.0.0.1; | 248 | ACCEPT_FROM = 127.0.0.1; |
264 | ACCEPT_FROM6 = ::1; | 249 | ACCEPT_FROM6 = ::1; |
@@ -271,7 +256,6 @@ UNIX_MATCH_GID = YES | |||
271 | HTTPPORT = 8080 | 256 | HTTPPORT = 8080 |
272 | HOME = $SERVICEHOME | 257 | HOME = $SERVICEHOME |
273 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 258 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
274 | CONFIG = $DEFAULTCONFIG | ||
275 | BINARY = gnunet-daemon-hostlist | 259 | BINARY = gnunet-daemon-hostlist |
276 | OPTIONS = -b | 260 | OPTIONS = -b |
277 | SERVERS = http://localhost:8080/ | 261 | SERVERS = http://localhost:8080/ |
@@ -282,7 +266,6 @@ AUTOSTART = YES | |||
282 | PORT = 20039 | 266 | PORT = 20039 |
283 | HOSTNAME = localhost | 267 | HOSTNAME = localhost |
284 | HOME = $SERVICEHOME | 268 | HOME = $SERVICEHOME |
285 | CONFIG = $DEFAULTCONFIG | ||
286 | BINARY = gnunet-service-core | 269 | BINARY = gnunet-service-core |
287 | ACCEPT_FROM = 127.0.0.1; | 270 | ACCEPT_FROM = 127.0.0.1; |
288 | ACCEPT_FROM6 = ::1; | 271 | ACCEPT_FROM6 = ::1; |
@@ -316,7 +299,6 @@ AUTOSTART = YES | |||
316 | PORT = 20037 | 299 | PORT = 20037 |
317 | HOSTNAME = localhost | 300 | HOSTNAME = localhost |
318 | HOME = $SERVICEHOME | 301 | HOME = $SERVICEHOME |
319 | CONFIG = $DEFAULTCONFIG | ||
320 | BINARY = gnunet-service-statistics | 302 | BINARY = gnunet-service-statistics |
321 | ACCEPT_FROM = 127.0.0.1; | 303 | ACCEPT_FROM = 127.0.0.1; |
322 | ACCEPT_FROM6 = ::1; | 304 | ACCEPT_FROM6 = ::1; |
@@ -329,7 +311,6 @@ AUTOSTART = YES | |||
329 | PORT = 20036 | 311 | PORT = 20036 |
330 | HOSTNAME = localhost | 312 | HOSTNAME = localhost |
331 | HOME = $SERVICEHOME | 313 | HOME = $SERVICEHOME |
332 | CONFIG = $DEFAULTCONFIG | ||
333 | BINARY = gnunet-service-dht | 314 | BINARY = gnunet-service-dht |
334 | ACCEPT_FROM = 127.0.0.1; | 315 | ACCEPT_FROM = 127.0.0.1; |
335 | ACCEPT_FROM6 = ::1; | 316 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf index 0ed1aee8f..523a4fdcf 100644 --- a/src/integration-tests/confs/c_no_nat_client_http.conf +++ b/src/integration-tests/confs/c_no_nat_client_http.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client/ | 2 | SERVICEHOME = /tmp/c_no_nat_client/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client_http.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -17,7 +16,6 @@ AUTOSTART = YES | |||
17 | PORT = 0 | 16 | PORT = 0 |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | HOME = $SERVICEHOME | 18 | HOME = $SERVICEHOME |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | BINARY = gnunet-service-dns | 19 | BINARY = gnunet-service-dns |
22 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
@@ -28,7 +26,6 @@ AUTOSTART = YES | |||
28 | PORT = 20035 | 26 | PORT = 20035 |
29 | HOSTNAME = localhost | 27 | HOSTNAME = localhost |
30 | HOME = $SERVICEHOME | 28 | HOME = $SERVICEHOME |
31 | CONFIG = $DEFAULTCONFIG | ||
32 | BINARY = gnunet-service-resolver | 29 | BINARY = gnunet-service-resolver |
33 | ACCEPT_FROM = 127.0.0.1; | 30 | ACCEPT_FROM = 127.0.0.1; |
34 | ACCEPT_FROM6 = ::1; | 31 | ACCEPT_FROM6 = ::1; |
@@ -41,7 +38,6 @@ AUTOSTART = YES | |||
41 | PORT = 20034 | 38 | PORT = 20034 |
42 | HOSTNAME = localhost | 39 | HOSTNAME = localhost |
43 | HOME = $SERVICEHOME | 40 | HOME = $SERVICEHOME |
44 | CONFIG = $DEFAULTCONFIG | ||
45 | BINARY = gnunet-service-mesh | 41 | BINARY = gnunet-service-mesh |
46 | ACCEPT_FROM = 127.0.0.1; | 42 | ACCEPT_FROM = 127.0.0.1; |
47 | ACCEPT_FROM6 = ::1; | 43 | ACCEPT_FROM6 = ::1; |
@@ -54,7 +50,6 @@ AUTOSTART = YES | |||
54 | PORT = 20033 | 50 | PORT = 20033 |
55 | HOSTNAME = localhost | 51 | HOSTNAME = localhost |
56 | HOME = $SERVICEHOME | 52 | HOME = $SERVICEHOME |
57 | CONFIG = $DEFAULTCONFIG | ||
58 | BINARY = gnunet-service-nse | 53 | BINARY = gnunet-service-nse |
59 | ACCEPT_FROM = 127.0.0.1; | 54 | ACCEPT_FROM = 127.0.0.1; |
60 | ACCEPT_FROM6 = ::1; | 55 | ACCEPT_FROM6 = ::1; |
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO | |||
73 | AUTOCONNECT = YES | 68 | AUTOCONNECT = YES |
74 | TARGET-CONNECTION-COUNT = 16 | 69 | TARGET-CONNECTION-COUNT = 16 |
75 | FRIENDS = $SERVICEHOME/friends | 70 | FRIENDS = $SERVICEHOME/friends |
76 | CONFIG = $DEFAULTCONFIG | ||
77 | BINARY = gnunet-daemon-topology | 71 | BINARY = gnunet-daemon-topology |
78 | 72 | ||
79 | [datastore] | 73 | [datastore] |
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES | |||
84 | PORT = 20032 | 78 | PORT = 20032 |
85 | HOSTNAME = localhost | 79 | HOSTNAME = localhost |
86 | HOME = $SERVICEHOME | 80 | HOME = $SERVICEHOME |
87 | CONFIG = $DEFAULTCONFIG | ||
88 | BINARY = gnunet-service-datastore | 81 | BINARY = gnunet-service-datastore |
89 | ACCEPT_FROM = 127.0.0.1; | 82 | ACCEPT_FROM = 127.0.0.1; |
90 | ACCEPT_FROM6 = ::1; | 83 | ACCEPT_FROM6 = ::1; |
@@ -107,7 +100,6 @@ AUTOSTART = YES | |||
107 | PORT = 20031 | 100 | PORT = 20031 |
108 | HOSTNAME = localhost | 101 | HOSTNAME = localhost |
109 | HOME = $SERVICEHOME | 102 | HOME = $SERVICEHOME |
110 | CONFIG = $DEFAULTCONFIG | ||
111 | BINARY = gnunet-service-peerinfo | 103 | BINARY = gnunet-service-peerinfo |
112 | ACCEPT_FROM = 127.0.0.1; | 104 | ACCEPT_FROM = 127.0.0.1; |
113 | ACCEPT_FROM6 = ::1; | 105 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20030 | 123 | PORT = 20030 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -155,7 +146,6 @@ AUTOSTART = YES | |||
155 | PORT = 20029 | 146 | PORT = 20029 |
156 | HOSTNAME = localhost | 147 | HOSTNAME = localhost |
157 | HOME = $SERVICEHOME | 148 | HOME = $SERVICEHOME |
158 | CONFIG = $DEFAULTCONFIG | ||
159 | BINARY = gnunet-service-transport | 149 | BINARY = gnunet-service-transport |
160 | NEIGHBOUR_LIMIT = 50 | 150 | NEIGHBOUR_LIMIT = 50 |
161 | ACCEPT_FROM = 127.0.0.1; | 151 | ACCEPT_FROM = 127.0.0.1; |
@@ -207,7 +197,6 @@ AUTOSTART = NO | |||
207 | PORT = 20024 | 197 | PORT = 20024 |
208 | HOSTNAME = localhost | 198 | HOSTNAME = localhost |
209 | HOME = $SERVICEHOME | 199 | HOME = $SERVICEHOME |
210 | CONFIG = $DEFAULTCONFIG | ||
211 | BINARY = gnunet-service-template | 200 | BINARY = gnunet-service-template |
212 | ACCEPT_FROM = 127.0.0.1; | 201 | ACCEPT_FROM = 127.0.0.1; |
213 | ACCEPT_FROM6 = ::1; | 202 | ACCEPT_FROM6 = ::1; |
@@ -225,7 +214,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
225 | PORT = 20023 | 214 | PORT = 20023 |
226 | HOSTNAME = localhost | 215 | HOSTNAME = localhost |
227 | HOME = $SERVICEHOME | 216 | HOME = $SERVICEHOME |
228 | CONFIG = $DEFAULTCONFIG | ||
229 | BINARY = gnunet-service-fs | 217 | BINARY = gnunet-service-fs |
230 | ACCEPT_FROM = 127.0.0.1; | 218 | ACCEPT_FROM = 127.0.0.1; |
231 | ACCEPT_FROM6 = ::1; | 219 | ACCEPT_FROM6 = ::1; |
@@ -240,7 +228,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
240 | EXPECTED_NEIGHBOUR_COUNT = 128 | 228 | EXPECTED_NEIGHBOUR_COUNT = 128 |
241 | 229 | ||
242 | [vpn] | 230 | [vpn] |
243 | CONFIG = $DEFAULTCONFIG | ||
244 | BINARY = gnunet-daemon-vpn | 231 | BINARY = gnunet-daemon-vpn |
245 | IPV6ADDR = 1234::1 | 232 | IPV6ADDR = 1234::1 |
246 | IPV6PREFIX = 32 | 233 | IPV6PREFIX = 32 |
@@ -251,7 +238,6 @@ VIRTDNS6 = 1234::17 | |||
251 | IFNAME = vpn-gnunet | 238 | IFNAME = vpn-gnunet |
252 | 239 | ||
253 | [exit] | 240 | [exit] |
254 | CONFIG = $DEFAULTCONFIG | ||
255 | BINARY = gnunet-daemon-exit | 241 | BINARY = gnunet-daemon-exit |
256 | IPV6ADDR = 1234:1::1 | 242 | IPV6ADDR = 1234:1::1 |
257 | IPV6PREFIX = 32 | 243 | IPV6PREFIX = 32 |
@@ -266,7 +252,6 @@ AUTOSTART = YES | |||
266 | PORT = 0 | 252 | PORT = 0 |
267 | HOSTNAME = localhost | 253 | HOSTNAME = localhost |
268 | HOME = $SERVICEHOME | 254 | HOME = $SERVICEHOME |
269 | CONFIG = $DEFAULTCONFIG | ||
270 | BINARY = gnunet-service-dns | 255 | BINARY = gnunet-service-dns |
271 | ACCEPT_FROM = 127.0.0.1; | 256 | ACCEPT_FROM = 127.0.0.1; |
272 | ACCEPT_FROM6 = ::1; | 257 | ACCEPT_FROM6 = ::1; |
@@ -277,7 +262,6 @@ PROVIDE_EXIT = NO | |||
277 | PORT = 20022 | 262 | PORT = 20022 |
278 | HOSTNAME = localhost | 263 | HOSTNAME = localhost |
279 | HOME = $SERVICEHOME | 264 | HOME = $SERVICEHOME |
280 | CONFIG = $DEFAULTCONFIG | ||
281 | BINARY = gnunet-service-arm | 265 | BINARY = gnunet-service-arm |
282 | ACCEPT_FROM = 127.0.0.1; | 266 | ACCEPT_FROM = 127.0.0.1; |
283 | ACCEPT_FROM6 = ::1; | 267 | ACCEPT_FROM6 = ::1; |
@@ -290,7 +274,6 @@ UNIX_MATCH_GID = YES | |||
290 | HTTPPORT = 8080 | 274 | HTTPPORT = 8080 |
291 | HOME = $SERVICEHOME | 275 | HOME = $SERVICEHOME |
292 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 276 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
293 | CONFIG = $DEFAULTCONFIG | ||
294 | BINARY = gnunet-daemon-hostlist | 277 | BINARY = gnunet-daemon-hostlist |
295 | OPTIONS = -b | 278 | OPTIONS = -b |
296 | SERVERS = http://localhost:8080/ | 279 | SERVERS = http://localhost:8080/ |
@@ -301,7 +284,6 @@ AUTOSTART = YES | |||
301 | PORT = 20021 | 284 | PORT = 20021 |
302 | HOSTNAME = localhost | 285 | HOSTNAME = localhost |
303 | HOME = $SERVICEHOME | 286 | HOME = $SERVICEHOME |
304 | CONFIG = $DEFAULTCONFIG | ||
305 | BINARY = gnunet-service-core | 287 | BINARY = gnunet-service-core |
306 | ACCEPT_FROM = 127.0.0.1; | 288 | ACCEPT_FROM = 127.0.0.1; |
307 | ACCEPT_FROM6 = ::1; | 289 | ACCEPT_FROM6 = ::1; |
@@ -335,7 +317,6 @@ AUTOSTART = YES | |||
335 | PORT = 20019 | 317 | PORT = 20019 |
336 | HOSTNAME = localhost | 318 | HOSTNAME = localhost |
337 | HOME = $SERVICEHOME | 319 | HOME = $SERVICEHOME |
338 | CONFIG = $DEFAULTCONFIG | ||
339 | BINARY = gnunet-service-statistics | 320 | BINARY = gnunet-service-statistics |
340 | ACCEPT_FROM = 127.0.0.1; | 321 | ACCEPT_FROM = 127.0.0.1; |
341 | ACCEPT_FROM6 = ::1; | 322 | ACCEPT_FROM6 = ::1; |
@@ -348,7 +329,6 @@ AUTOSTART = YES | |||
348 | PORT = 20018 | 329 | PORT = 20018 |
349 | HOSTNAME = localhost | 330 | HOSTNAME = localhost |
350 | HOME = $SERVICEHOME | 331 | HOME = $SERVICEHOME |
351 | CONFIG = $DEFAULTCONFIG | ||
352 | BINARY = gnunet-service-dht | 332 | BINARY = gnunet-service-dht |
353 | ACCEPT_FROM = 127.0.0.1; | 333 | ACCEPT_FROM = 127.0.0.1; |
354 | ACCEPT_FROM6 = ::1; | 334 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf index 47c861a72..1f7f08523 100644 --- a/src/integration-tests/confs/c_no_nat_client_http_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client_2/ | 2 | SERVICEHOME = /tmp/c_no_nat_client_2/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client_http_2.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -17,7 +16,6 @@ AUTOSTART = YES | |||
17 | PORT = 20053 | 16 | PORT = 20053 |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | HOME = $SERVICEHOME | 18 | HOME = $SERVICEHOME |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | BINARY = gnunet-service-resolver | 19 | BINARY = gnunet-service-resolver |
22 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
@@ -30,7 +28,6 @@ AUTOSTART = YES | |||
30 | PORT = 20052 | 28 | PORT = 20052 |
31 | HOSTNAME = localhost | 29 | HOSTNAME = localhost |
32 | HOME = $SERVICEHOME | 30 | HOME = $SERVICEHOME |
33 | CONFIG = $DEFAULTCONFIG | ||
34 | BINARY = gnunet-service-mesh | 31 | BINARY = gnunet-service-mesh |
35 | ACCEPT_FROM = 127.0.0.1; | 32 | ACCEPT_FROM = 127.0.0.1; |
36 | ACCEPT_FROM6 = ::1; | 33 | ACCEPT_FROM6 = ::1; |
@@ -43,7 +40,6 @@ AUTOSTART = YES | |||
43 | PORT = 20051 | 40 | PORT = 20051 |
44 | HOSTNAME = localhost | 41 | HOSTNAME = localhost |
45 | HOME = $SERVICEHOME | 42 | HOME = $SERVICEHOME |
46 | CONFIG = $DEFAULTCONFIG | ||
47 | BINARY = gnunet-service-nse | 43 | BINARY = gnunet-service-nse |
48 | ACCEPT_FROM = 127.0.0.1; | 44 | ACCEPT_FROM = 127.0.0.1; |
49 | ACCEPT_FROM6 = ::1; | 45 | ACCEPT_FROM6 = ::1; |
@@ -62,7 +58,6 @@ FRIENDS-ONLY = NO | |||
62 | AUTOCONNECT = YES | 58 | AUTOCONNECT = YES |
63 | TARGET-CONNECTION-COUNT = 16 | 59 | TARGET-CONNECTION-COUNT = 16 |
64 | FRIENDS = $SERVICEHOME/friends | 60 | FRIENDS = $SERVICEHOME/friends |
65 | CONFIG = $DEFAULTCONFIG | ||
66 | BINARY = gnunet-daemon-topology | 61 | BINARY = gnunet-daemon-topology |
67 | 62 | ||
68 | [datastore] | 63 | [datastore] |
@@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES | |||
73 | PORT = 20050 | 68 | PORT = 20050 |
74 | HOSTNAME = localhost | 69 | HOSTNAME = localhost |
75 | HOME = $SERVICEHOME | 70 | HOME = $SERVICEHOME |
76 | CONFIG = $DEFAULTCONFIG | ||
77 | BINARY = gnunet-service-datastore | 71 | BINARY = gnunet-service-datastore |
78 | ACCEPT_FROM = 127.0.0.1; | 72 | ACCEPT_FROM = 127.0.0.1; |
79 | ACCEPT_FROM6 = ::1; | 73 | ACCEPT_FROM6 = ::1; |
@@ -96,7 +90,6 @@ AUTOSTART = YES | |||
96 | PORT = 20049 | 90 | PORT = 20049 |
97 | HOSTNAME = localhost | 91 | HOSTNAME = localhost |
98 | HOME = $SERVICEHOME | 92 | HOME = $SERVICEHOME |
99 | CONFIG = $DEFAULTCONFIG | ||
100 | BINARY = gnunet-service-peerinfo | 93 | BINARY = gnunet-service-peerinfo |
101 | ACCEPT_FROM = 127.0.0.1; | 94 | ACCEPT_FROM = 127.0.0.1; |
102 | ACCEPT_FROM6 = ::1; | 95 | ACCEPT_FROM6 = ::1; |
@@ -120,7 +113,6 @@ AUTOSTART = YES | |||
120 | PORT = 20048 | 113 | PORT = 20048 |
121 | HOSTNAME = localhost | 114 | HOSTNAME = localhost |
122 | HOME = $SERVICEHOME | 115 | HOME = $SERVICEHOME |
123 | CONFIG = $DEFAULTCONFIG | ||
124 | BINARY = gnunet-service-ats | 116 | BINARY = gnunet-service-ats |
125 | ACCEPT_FROM = 127.0.0.1; | 117 | ACCEPT_FROM = 127.0.0.1; |
126 | ACCEPT_FROM6 = ::1; | 118 | ACCEPT_FROM6 = ::1; |
@@ -144,7 +136,6 @@ AUTOSTART = YES | |||
144 | PORT = 20047 | 136 | PORT = 20047 |
145 | HOSTNAME = localhost | 137 | HOSTNAME = localhost |
146 | HOME = $SERVICEHOME | 138 | HOME = $SERVICEHOME |
147 | CONFIG = $DEFAULTCONFIG | ||
148 | BINARY = gnunet-service-transport | 139 | BINARY = gnunet-service-transport |
149 | NEIGHBOUR_LIMIT = 50 | 140 | NEIGHBOUR_LIMIT = 50 |
150 | ACCEPT_FROM = 127.0.0.1; | 141 | ACCEPT_FROM = 127.0.0.1; |
@@ -196,7 +187,6 @@ AUTOSTART = NO | |||
196 | PORT = 20042 | 187 | PORT = 20042 |
197 | HOSTNAME = localhost | 188 | HOSTNAME = localhost |
198 | HOME = $SERVICEHOME | 189 | HOME = $SERVICEHOME |
199 | CONFIG = $DEFAULTCONFIG | ||
200 | BINARY = gnunet-service-template | 190 | BINARY = gnunet-service-template |
201 | ACCEPT_FROM = 127.0.0.1; | 191 | ACCEPT_FROM = 127.0.0.1; |
202 | ACCEPT_FROM6 = ::1; | 192 | ACCEPT_FROM6 = ::1; |
@@ -214,7 +204,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
214 | PORT = 20041 | 204 | PORT = 20041 |
215 | HOSTNAME = localhost | 205 | HOSTNAME = localhost |
216 | HOME = $SERVICEHOME | 206 | HOME = $SERVICEHOME |
217 | CONFIG = $DEFAULTCONFIG | ||
218 | BINARY = gnunet-service-fs | 207 | BINARY = gnunet-service-fs |
219 | ACCEPT_FROM = 127.0.0.1; | 208 | ACCEPT_FROM = 127.0.0.1; |
220 | ACCEPT_FROM6 = ::1; | 209 | ACCEPT_FROM6 = ::1; |
@@ -229,7 +218,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
229 | EXPECTED_NEIGHBOUR_COUNT = 128 | 218 | EXPECTED_NEIGHBOUR_COUNT = 128 |
230 | 219 | ||
231 | [vpn] | 220 | [vpn] |
232 | CONFIG = $DEFAULTCONFIG | ||
233 | BINARY = gnunet-daemon-vpn | 221 | BINARY = gnunet-daemon-vpn |
234 | IPV6ADDR = 1234::1 | 222 | IPV6ADDR = 1234::1 |
235 | IPV6PREFIX = 32 | 223 | IPV6PREFIX = 32 |
@@ -240,7 +228,6 @@ VIRTDNS6 = 1234::17 | |||
240 | IFNAME = vpn-gnunet | 228 | IFNAME = vpn-gnunet |
241 | 229 | ||
242 | [exit] | 230 | [exit] |
243 | CONFIG = $DEFAULTCONFIG | ||
244 | BINARY = gnunet-daemon-exit | 231 | BINARY = gnunet-daemon-exit |
245 | IPV6ADDR = 1234:1::1 | 232 | IPV6ADDR = 1234:1::1 |
246 | IPV6PREFIX = 32 | 233 | IPV6PREFIX = 32 |
@@ -255,7 +242,6 @@ AUTOSTART = YES | |||
255 | PORT = 0 | 242 | PORT = 0 |
256 | HOSTNAME = localhost | 243 | HOSTNAME = localhost |
257 | HOME = $SERVICEHOME | 244 | HOME = $SERVICEHOME |
258 | CONFIG = $DEFAULTCONFIG | ||
259 | BINARY = gnunet-service-dns | 245 | BINARY = gnunet-service-dns |
260 | ACCEPT_FROM = 127.0.0.1; | 246 | ACCEPT_FROM = 127.0.0.1; |
261 | ACCEPT_FROM6 = ::1; | 247 | ACCEPT_FROM6 = ::1; |
@@ -266,7 +252,6 @@ PROVIDE_EXIT = NO | |||
266 | PORT = 20040 | 252 | PORT = 20040 |
267 | HOSTNAME = localhost | 253 | HOSTNAME = localhost |
268 | HOME = $SERVICEHOME | 254 | HOME = $SERVICEHOME |
269 | CONFIG = $DEFAULTCONFIG | ||
270 | BINARY = gnunet-service-arm | 255 | BINARY = gnunet-service-arm |
271 | ACCEPT_FROM = 127.0.0.1; | 256 | ACCEPT_FROM = 127.0.0.1; |
272 | ACCEPT_FROM6 = ::1; | 257 | ACCEPT_FROM6 = ::1; |
@@ -279,7 +264,6 @@ UNIX_MATCH_GID = YES | |||
279 | HTTPPORT = 8080 | 264 | HTTPPORT = 8080 |
280 | HOME = $SERVICEHOME | 265 | HOME = $SERVICEHOME |
281 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 266 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
282 | CONFIG = $DEFAULTCONFIG | ||
283 | BINARY = gnunet-daemon-hostlist | 267 | BINARY = gnunet-daemon-hostlist |
284 | OPTIONS = -b | 268 | OPTIONS = -b |
285 | SERVERS = http://localhost:8080/ | 269 | SERVERS = http://localhost:8080/ |
@@ -290,7 +274,6 @@ AUTOSTART = YES | |||
290 | PORT = 20039 | 274 | PORT = 20039 |
291 | HOSTNAME = localhost | 275 | HOSTNAME = localhost |
292 | HOME = $SERVICEHOME | 276 | HOME = $SERVICEHOME |
293 | CONFIG = $DEFAULTCONFIG | ||
294 | BINARY = gnunet-service-core | 277 | BINARY = gnunet-service-core |
295 | ACCEPT_FROM = 127.0.0.1; | 278 | ACCEPT_FROM = 127.0.0.1; |
296 | ACCEPT_FROM6 = ::1; | 279 | ACCEPT_FROM6 = ::1; |
@@ -324,7 +307,6 @@ AUTOSTART = YES | |||
324 | PORT = 20037 | 307 | PORT = 20037 |
325 | HOSTNAME = localhost | 308 | HOSTNAME = localhost |
326 | HOME = $SERVICEHOME | 309 | HOME = $SERVICEHOME |
327 | CONFIG = $DEFAULTCONFIG | ||
328 | BINARY = gnunet-service-statistics | 310 | BINARY = gnunet-service-statistics |
329 | ACCEPT_FROM = 127.0.0.1; | 311 | ACCEPT_FROM = 127.0.0.1; |
330 | ACCEPT_FROM6 = ::1; | 312 | ACCEPT_FROM6 = ::1; |
@@ -337,7 +319,6 @@ AUTOSTART = YES | |||
337 | PORT = 20036 | 319 | PORT = 20036 |
338 | HOSTNAME = localhost | 320 | HOSTNAME = localhost |
339 | HOME = $SERVICEHOME | 321 | HOME = $SERVICEHOME |
340 | CONFIG = $DEFAULTCONFIG | ||
341 | BINARY = gnunet-service-dht | 322 | BINARY = gnunet-service-dht |
342 | ACCEPT_FROM = 127.0.0.1; | 323 | ACCEPT_FROM = 127.0.0.1; |
343 | ACCEPT_FROM6 = ::1; | 324 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf index b48042908..62d679fd2 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client/ | 2 | SERVICEHOME = /tmp/c_no_nat_client/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client_unix.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -17,7 +16,6 @@ AUTOSTART = YES | |||
17 | PORT = 0 | 16 | PORT = 0 |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | HOME = $SERVICEHOME | 18 | HOME = $SERVICEHOME |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | BINARY = gnunet-service-dns | 19 | BINARY = gnunet-service-dns |
22 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
@@ -28,7 +26,6 @@ AUTOSTART = YES | |||
28 | PORT = 20035 | 26 | PORT = 20035 |
29 | HOSTNAME = localhost | 27 | HOSTNAME = localhost |
30 | HOME = $SERVICEHOME | 28 | HOME = $SERVICEHOME |
31 | CONFIG = $DEFAULTCONFIG | ||
32 | BINARY = gnunet-service-resolver | 29 | BINARY = gnunet-service-resolver |
33 | ACCEPT_FROM = 127.0.0.1; | 30 | ACCEPT_FROM = 127.0.0.1; |
34 | ACCEPT_FROM6 = ::1; | 31 | ACCEPT_FROM6 = ::1; |
@@ -41,7 +38,6 @@ AUTOSTART = YES | |||
41 | PORT = 20034 | 38 | PORT = 20034 |
42 | HOSTNAME = localhost | 39 | HOSTNAME = localhost |
43 | HOME = $SERVICEHOME | 40 | HOME = $SERVICEHOME |
44 | CONFIG = $DEFAULTCONFIG | ||
45 | BINARY = gnunet-service-mesh | 41 | BINARY = gnunet-service-mesh |
46 | ACCEPT_FROM = 127.0.0.1; | 42 | ACCEPT_FROM = 127.0.0.1; |
47 | ACCEPT_FROM6 = ::1; | 43 | ACCEPT_FROM6 = ::1; |
@@ -54,7 +50,6 @@ AUTOSTART = YES | |||
54 | PORT = 20033 | 50 | PORT = 20033 |
55 | HOSTNAME = localhost | 51 | HOSTNAME = localhost |
56 | HOME = $SERVICEHOME | 52 | HOME = $SERVICEHOME |
57 | CONFIG = $DEFAULTCONFIG | ||
58 | BINARY = gnunet-service-nse | 53 | BINARY = gnunet-service-nse |
59 | ACCEPT_FROM = 127.0.0.1; | 54 | ACCEPT_FROM = 127.0.0.1; |
60 | ACCEPT_FROM6 = ::1; | 55 | ACCEPT_FROM6 = ::1; |
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO | |||
73 | AUTOCONNECT = YES | 68 | AUTOCONNECT = YES |
74 | TARGET-CONNECTION-COUNT = 16 | 69 | TARGET-CONNECTION-COUNT = 16 |
75 | FRIENDS = $SERVICEHOME/friends | 70 | FRIENDS = $SERVICEHOME/friends |
76 | CONFIG = $DEFAULTCONFIG | ||
77 | BINARY = gnunet-daemon-topology | 71 | BINARY = gnunet-daemon-topology |
78 | 72 | ||
79 | [datastore] | 73 | [datastore] |
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES | |||
84 | PORT = 20032 | 78 | PORT = 20032 |
85 | HOSTNAME = localhost | 79 | HOSTNAME = localhost |
86 | HOME = $SERVICEHOME | 80 | HOME = $SERVICEHOME |
87 | CONFIG = $DEFAULTCONFIG | ||
88 | BINARY = gnunet-service-datastore | 81 | BINARY = gnunet-service-datastore |
89 | ACCEPT_FROM = 127.0.0.1; | 82 | ACCEPT_FROM = 127.0.0.1; |
90 | ACCEPT_FROM6 = ::1; | 83 | ACCEPT_FROM6 = ::1; |
@@ -107,7 +100,6 @@ AUTOSTART = YES | |||
107 | PORT = 20031 | 100 | PORT = 20031 |
108 | HOSTNAME = localhost | 101 | HOSTNAME = localhost |
109 | HOME = $SERVICEHOME | 102 | HOME = $SERVICEHOME |
110 | CONFIG = $DEFAULTCONFIG | ||
111 | BINARY = gnunet-service-peerinfo | 103 | BINARY = gnunet-service-peerinfo |
112 | ACCEPT_FROM = 127.0.0.1; | 104 | ACCEPT_FROM = 127.0.0.1; |
113 | ACCEPT_FROM6 = ::1; | 105 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20030 | 123 | PORT = 20030 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -155,7 +146,6 @@ AUTOSTART = YES | |||
155 | PORT = 20029 | 146 | PORT = 20029 |
156 | HOSTNAME = localhost | 147 | HOSTNAME = localhost |
157 | HOME = $SERVICEHOME | 148 | HOME = $SERVICEHOME |
158 | CONFIG = $DEFAULTCONFIG | ||
159 | BINARY = gnunet-service-transport | 149 | BINARY = gnunet-service-transport |
160 | NEIGHBOUR_LIMIT = 50 | 150 | NEIGHBOUR_LIMIT = 50 |
161 | ACCEPT_FROM = 127.0.0.1; | 151 | ACCEPT_FROM = 127.0.0.1; |
@@ -210,7 +200,6 @@ AUTOSTART = NO | |||
210 | PORT = 20024 | 200 | PORT = 20024 |
211 | HOSTNAME = localhost | 201 | HOSTNAME = localhost |
212 | HOME = $SERVICEHOME | 202 | HOME = $SERVICEHOME |
213 | CONFIG = $DEFAULTCONFIG | ||
214 | BINARY = gnunet-service-template | 203 | BINARY = gnunet-service-template |
215 | ACCEPT_FROM = 127.0.0.1; | 204 | ACCEPT_FROM = 127.0.0.1; |
216 | ACCEPT_FROM6 = ::1; | 205 | ACCEPT_FROM6 = ::1; |
@@ -228,7 +217,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
228 | PORT = 20023 | 217 | PORT = 20023 |
229 | HOSTNAME = localhost | 218 | HOSTNAME = localhost |
230 | HOME = $SERVICEHOME | 219 | HOME = $SERVICEHOME |
231 | CONFIG = $DEFAULTCONFIG | ||
232 | BINARY = gnunet-service-fs | 220 | BINARY = gnunet-service-fs |
233 | ACCEPT_FROM = 127.0.0.1; | 221 | ACCEPT_FROM = 127.0.0.1; |
234 | ACCEPT_FROM6 = ::1; | 222 | ACCEPT_FROM6 = ::1; |
@@ -243,7 +231,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
243 | EXPECTED_NEIGHBOUR_COUNT = 128 | 231 | EXPECTED_NEIGHBOUR_COUNT = 128 |
244 | 232 | ||
245 | [vpn] | 233 | [vpn] |
246 | CONFIG = $DEFAULTCONFIG | ||
247 | BINARY = gnunet-daemon-vpn | 234 | BINARY = gnunet-daemon-vpn |
248 | IPV6ADDR = 1234::1 | 235 | IPV6ADDR = 1234::1 |
249 | IPV6PREFIX = 32 | 236 | IPV6PREFIX = 32 |
@@ -254,7 +241,6 @@ VIRTDNS6 = 1234::17 | |||
254 | IFNAME = vpn-gnunet | 241 | IFNAME = vpn-gnunet |
255 | 242 | ||
256 | [exit] | 243 | [exit] |
257 | CONFIG = $DEFAULTCONFIG | ||
258 | BINARY = gnunet-daemon-exit | 244 | BINARY = gnunet-daemon-exit |
259 | IPV6ADDR = 1234:1::1 | 245 | IPV6ADDR = 1234:1::1 |
260 | IPV6PREFIX = 32 | 246 | IPV6PREFIX = 32 |
@@ -269,7 +255,6 @@ AUTOSTART = YES | |||
269 | PORT = 0 | 255 | PORT = 0 |
270 | HOSTNAME = localhost | 256 | HOSTNAME = localhost |
271 | HOME = $SERVICEHOME | 257 | HOME = $SERVICEHOME |
272 | CONFIG = $DEFAULTCONFIG | ||
273 | BINARY = gnunet-service-dns | 258 | BINARY = gnunet-service-dns |
274 | ACCEPT_FROM = 127.0.0.1; | 259 | ACCEPT_FROM = 127.0.0.1; |
275 | ACCEPT_FROM6 = ::1; | 260 | ACCEPT_FROM6 = ::1; |
@@ -280,7 +265,6 @@ PROVIDE_EXIT = NO | |||
280 | PORT = 20022 | 265 | PORT = 20022 |
281 | HOSTNAME = localhost | 266 | HOSTNAME = localhost |
282 | HOME = $SERVICEHOME | 267 | HOME = $SERVICEHOME |
283 | CONFIG = $DEFAULTCONFIG | ||
284 | BINARY = gnunet-service-arm | 268 | BINARY = gnunet-service-arm |
285 | ACCEPT_FROM = 127.0.0.1; | 269 | ACCEPT_FROM = 127.0.0.1; |
286 | ACCEPT_FROM6 = ::1; | 270 | ACCEPT_FROM6 = ::1; |
@@ -293,7 +277,6 @@ UNIX_MATCH_GID = YES | |||
293 | HTTPPORT = 8080 | 277 | HTTPPORT = 8080 |
294 | HOME = $SERVICEHOME | 278 | HOME = $SERVICEHOME |
295 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 279 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
296 | CONFIG = $DEFAULTCONFIG | ||
297 | BINARY = gnunet-daemon-hostlist | 280 | BINARY = gnunet-daemon-hostlist |
298 | OPTIONS = -b | 281 | OPTIONS = -b |
299 | SERVERS = http://localhost:8080/ | 282 | SERVERS = http://localhost:8080/ |
@@ -304,7 +287,6 @@ AUTOSTART = YES | |||
304 | PORT = 20021 | 287 | PORT = 20021 |
305 | HOSTNAME = localhost | 288 | HOSTNAME = localhost |
306 | HOME = $SERVICEHOME | 289 | HOME = $SERVICEHOME |
307 | CONFIG = $DEFAULTCONFIG | ||
308 | BINARY = gnunet-service-core | 290 | BINARY = gnunet-service-core |
309 | ACCEPT_FROM = 127.0.0.1; | 291 | ACCEPT_FROM = 127.0.0.1; |
310 | ACCEPT_FROM6 = ::1; | 292 | ACCEPT_FROM6 = ::1; |
@@ -338,7 +320,6 @@ AUTOSTART = YES | |||
338 | PORT = 20019 | 320 | PORT = 20019 |
339 | HOSTNAME = localhost | 321 | HOSTNAME = localhost |
340 | HOME = $SERVICEHOME | 322 | HOME = $SERVICEHOME |
341 | CONFIG = $DEFAULTCONFIG | ||
342 | BINARY = gnunet-service-statistics | 323 | BINARY = gnunet-service-statistics |
343 | ACCEPT_FROM = 127.0.0.1; | 324 | ACCEPT_FROM = 127.0.0.1; |
344 | ACCEPT_FROM6 = ::1; | 325 | ACCEPT_FROM6 = ::1; |
@@ -351,7 +332,6 @@ AUTOSTART = YES | |||
351 | PORT = 20018 | 332 | PORT = 20018 |
352 | HOSTNAME = localhost | 333 | HOSTNAME = localhost |
353 | HOME = $SERVICEHOME | 334 | HOME = $SERVICEHOME |
354 | CONFIG = $DEFAULTCONFIG | ||
355 | BINARY = gnunet-service-dht | 335 | BINARY = gnunet-service-dht |
356 | ACCEPT_FROM = 127.0.0.1; | 336 | ACCEPT_FROM = 127.0.0.1; |
357 | ACCEPT_FROM6 = ::1; | 337 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf index ca4da89cb..a4080ab20 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_no_nat_client_2/ | 2 | SERVICEHOME = /tmp/c_no_nat_client_2/ |
3 | DEFAULTCONFIG = confs/c_no_nat_client_unix_2.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 5 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -17,7 +16,6 @@ AUTOSTART = YES | |||
17 | PORT = 20053 | 16 | PORT = 20053 |
18 | HOSTNAME = localhost | 17 | HOSTNAME = localhost |
19 | HOME = $SERVICEHOME | 18 | HOME = $SERVICEHOME |
20 | CONFIG = $DEFAULTCONFIG | ||
21 | BINARY = gnunet-service-resolver | 19 | BINARY = gnunet-service-resolver |
22 | ACCEPT_FROM = 127.0.0.1; | 20 | ACCEPT_FROM = 127.0.0.1; |
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
@@ -30,7 +28,6 @@ AUTOSTART = YES | |||
30 | PORT = 20052 | 28 | PORT = 20052 |
31 | HOSTNAME = localhost | 29 | HOSTNAME = localhost |
32 | HOME = $SERVICEHOME | 30 | HOME = $SERVICEHOME |
33 | CONFIG = $DEFAULTCONFIG | ||
34 | BINARY = gnunet-service-mesh | 31 | BINARY = gnunet-service-mesh |
35 | ACCEPT_FROM = 127.0.0.1; | 32 | ACCEPT_FROM = 127.0.0.1; |
36 | ACCEPT_FROM6 = ::1; | 33 | ACCEPT_FROM6 = ::1; |
@@ -43,7 +40,6 @@ AUTOSTART = YES | |||
43 | PORT = 20051 | 40 | PORT = 20051 |
44 | HOSTNAME = localhost | 41 | HOSTNAME = localhost |
45 | HOME = $SERVICEHOME | 42 | HOME = $SERVICEHOME |
46 | CONFIG = $DEFAULTCONFIG | ||
47 | BINARY = gnunet-service-nse | 43 | BINARY = gnunet-service-nse |
48 | ACCEPT_FROM = 127.0.0.1; | 44 | ACCEPT_FROM = 127.0.0.1; |
49 | ACCEPT_FROM6 = ::1; | 45 | ACCEPT_FROM6 = ::1; |
@@ -62,7 +58,6 @@ FRIENDS-ONLY = NO | |||
62 | AUTOCONNECT = YES | 58 | AUTOCONNECT = YES |
63 | TARGET-CONNECTION-COUNT = 16 | 59 | TARGET-CONNECTION-COUNT = 16 |
64 | FRIENDS = $SERVICEHOME/friends | 60 | FRIENDS = $SERVICEHOME/friends |
65 | CONFIG = $DEFAULTCONFIG | ||
66 | BINARY = gnunet-daemon-topology | 61 | BINARY = gnunet-daemon-topology |
67 | 62 | ||
68 | [datastore] | 63 | [datastore] |
@@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES | |||
73 | PORT = 20050 | 68 | PORT = 20050 |
74 | HOSTNAME = localhost | 69 | HOSTNAME = localhost |
75 | HOME = $SERVICEHOME | 70 | HOME = $SERVICEHOME |
76 | CONFIG = $DEFAULTCONFIG | ||
77 | BINARY = gnunet-service-datastore | 71 | BINARY = gnunet-service-datastore |
78 | ACCEPT_FROM = 127.0.0.1; | 72 | ACCEPT_FROM = 127.0.0.1; |
79 | ACCEPT_FROM6 = ::1; | 73 | ACCEPT_FROM6 = ::1; |
@@ -96,7 +90,6 @@ AUTOSTART = YES | |||
96 | PORT = 20049 | 90 | PORT = 20049 |
97 | HOSTNAME = localhost | 91 | HOSTNAME = localhost |
98 | HOME = $SERVICEHOME | 92 | HOME = $SERVICEHOME |
99 | CONFIG = $DEFAULTCONFIG | ||
100 | BINARY = gnunet-service-peerinfo | 93 | BINARY = gnunet-service-peerinfo |
101 | ACCEPT_FROM = 127.0.0.1; | 94 | ACCEPT_FROM = 127.0.0.1; |
102 | ACCEPT_FROM6 = ::1; | 95 | ACCEPT_FROM6 = ::1; |
@@ -120,7 +113,6 @@ AUTOSTART = YES | |||
120 | PORT = 20048 | 113 | PORT = 20048 |
121 | HOSTNAME = localhost | 114 | HOSTNAME = localhost |
122 | HOME = $SERVICEHOME | 115 | HOME = $SERVICEHOME |
123 | CONFIG = $DEFAULTCONFIG | ||
124 | BINARY = gnunet-service-ats | 116 | BINARY = gnunet-service-ats |
125 | ACCEPT_FROM = 127.0.0.1; | 117 | ACCEPT_FROM = 127.0.0.1; |
126 | ACCEPT_FROM6 = ::1; | 118 | ACCEPT_FROM6 = ::1; |
@@ -144,7 +136,6 @@ AUTOSTART = YES | |||
144 | PORT = 20047 | 136 | PORT = 20047 |
145 | HOSTNAME = localhost | 137 | HOSTNAME = localhost |
146 | HOME = $SERVICEHOME | 138 | HOME = $SERVICEHOME |
147 | CONFIG = $DEFAULTCONFIG | ||
148 | BINARY = gnunet-service-transport | 139 | BINARY = gnunet-service-transport |
149 | NEIGHBOUR_LIMIT = 50 | 140 | NEIGHBOUR_LIMIT = 50 |
150 | ACCEPT_FROM = 127.0.0.1; | 141 | ACCEPT_FROM = 127.0.0.1; |
@@ -199,7 +190,6 @@ AUTOSTART = NO | |||
199 | PORT = 20042 | 190 | PORT = 20042 |
200 | HOSTNAME = localhost | 191 | HOSTNAME = localhost |
201 | HOME = $SERVICEHOME | 192 | HOME = $SERVICEHOME |
202 | CONFIG = $DEFAULTCONFIG | ||
203 | BINARY = gnunet-service-template | 193 | BINARY = gnunet-service-template |
204 | ACCEPT_FROM = 127.0.0.1; | 194 | ACCEPT_FROM = 127.0.0.1; |
205 | ACCEPT_FROM6 = ::1; | 195 | ACCEPT_FROM6 = ::1; |
@@ -217,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
217 | PORT = 20041 | 207 | PORT = 20041 |
218 | HOSTNAME = localhost | 208 | HOSTNAME = localhost |
219 | HOME = $SERVICEHOME | 209 | HOME = $SERVICEHOME |
220 | CONFIG = $DEFAULTCONFIG | ||
221 | BINARY = gnunet-service-fs | 210 | BINARY = gnunet-service-fs |
222 | ACCEPT_FROM = 127.0.0.1; | 211 | ACCEPT_FROM = 127.0.0.1; |
223 | ACCEPT_FROM6 = ::1; | 212 | ACCEPT_FROM6 = ::1; |
@@ -232,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
232 | EXPECTED_NEIGHBOUR_COUNT = 128 | 221 | EXPECTED_NEIGHBOUR_COUNT = 128 |
233 | 222 | ||
234 | [vpn] | 223 | [vpn] |
235 | CONFIG = $DEFAULTCONFIG | ||
236 | BINARY = gnunet-daemon-vpn | 224 | BINARY = gnunet-daemon-vpn |
237 | IPV6ADDR = 1234::1 | 225 | IPV6ADDR = 1234::1 |
238 | IPV6PREFIX = 32 | 226 | IPV6PREFIX = 32 |
@@ -243,7 +231,6 @@ VIRTDNS6 = 1234::17 | |||
243 | IFNAME = vpn-gnunet | 231 | IFNAME = vpn-gnunet |
244 | 232 | ||
245 | [exit] | 233 | [exit] |
246 | CONFIG = $DEFAULTCONFIG | ||
247 | BINARY = gnunet-daemon-exit | 234 | BINARY = gnunet-daemon-exit |
248 | IPV6ADDR = 1234:1::1 | 235 | IPV6ADDR = 1234:1::1 |
249 | IPV6PREFIX = 32 | 236 | IPV6PREFIX = 32 |
@@ -258,7 +245,6 @@ AUTOSTART = YES | |||
258 | PORT = 0 | 245 | PORT = 0 |
259 | HOSTNAME = localhost | 246 | HOSTNAME = localhost |
260 | HOME = $SERVICEHOME | 247 | HOME = $SERVICEHOME |
261 | CONFIG = $DEFAULTCONFIG | ||
262 | BINARY = gnunet-service-dns | 248 | BINARY = gnunet-service-dns |
263 | ACCEPT_FROM = 127.0.0.1; | 249 | ACCEPT_FROM = 127.0.0.1; |
264 | ACCEPT_FROM6 = ::1; | 250 | ACCEPT_FROM6 = ::1; |
@@ -269,7 +255,6 @@ PROVIDE_EXIT = NO | |||
269 | PORT = 20040 | 255 | PORT = 20040 |
270 | HOSTNAME = localhost | 256 | HOSTNAME = localhost |
271 | HOME = $SERVICEHOME | 257 | HOME = $SERVICEHOME |
272 | CONFIG = $DEFAULTCONFIG | ||
273 | BINARY = gnunet-service-arm | 258 | BINARY = gnunet-service-arm |
274 | ACCEPT_FROM = 127.0.0.1; | 259 | ACCEPT_FROM = 127.0.0.1; |
275 | ACCEPT_FROM6 = ::1; | 260 | ACCEPT_FROM6 = ::1; |
@@ -282,7 +267,6 @@ UNIX_MATCH_GID = YES | |||
282 | HTTPPORT = 8080 | 267 | HTTPPORT = 8080 |
283 | HOME = $SERVICEHOME | 268 | HOME = $SERVICEHOME |
284 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 269 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
285 | CONFIG = $DEFAULTCONFIG | ||
286 | BINARY = gnunet-daemon-hostlist | 270 | BINARY = gnunet-daemon-hostlist |
287 | OPTIONS = -b | 271 | OPTIONS = -b |
288 | SERVERS = http://localhost:8080/ | 272 | SERVERS = http://localhost:8080/ |
@@ -293,7 +277,6 @@ AUTOSTART = YES | |||
293 | PORT = 20039 | 277 | PORT = 20039 |
294 | HOSTNAME = localhost | 278 | HOSTNAME = localhost |
295 | HOME = $SERVICEHOME | 279 | HOME = $SERVICEHOME |
296 | CONFIG = $DEFAULTCONFIG | ||
297 | BINARY = gnunet-service-core | 280 | BINARY = gnunet-service-core |
298 | ACCEPT_FROM = 127.0.0.1; | 281 | ACCEPT_FROM = 127.0.0.1; |
299 | ACCEPT_FROM6 = ::1; | 282 | ACCEPT_FROM6 = ::1; |
@@ -327,7 +310,6 @@ AUTOSTART = YES | |||
327 | PORT = 20037 | 310 | PORT = 20037 |
328 | HOSTNAME = localhost | 311 | HOSTNAME = localhost |
329 | HOME = $SERVICEHOME | 312 | HOME = $SERVICEHOME |
330 | CONFIG = $DEFAULTCONFIG | ||
331 | BINARY = gnunet-service-statistics | 313 | BINARY = gnunet-service-statistics |
332 | ACCEPT_FROM = 127.0.0.1; | 314 | ACCEPT_FROM = 127.0.0.1; |
333 | ACCEPT_FROM6 = ::1; | 315 | ACCEPT_FROM6 = ::1; |
@@ -340,7 +322,6 @@ AUTOSTART = YES | |||
340 | PORT = 20036 | 322 | PORT = 20036 |
341 | HOSTNAME = localhost | 323 | HOSTNAME = localhost |
342 | HOME = $SERVICEHOME | 324 | HOME = $SERVICEHOME |
343 | CONFIG = $DEFAULTCONFIG | ||
344 | BINARY = gnunet-service-dht | 325 | BINARY = gnunet-service-dht |
345 | ACCEPT_FROM = 127.0.0.1; | 326 | ACCEPT_FROM = 127.0.0.1; |
346 | ACCEPT_FROM6 = ::1; | 327 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf index f01cac9d1..d224670fe 100644 --- a/src/integration-tests/confs/c_normal_client_tcp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_normal_client | 2 | SERVICEHOME = /tmp/c_normal_client |
3 | DEFAULTCONFIG = confs/c_normal_client_tcp.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = hostkeys/0002-hostkey | 5 | HOSTKEY = hostkeys/0002-hostkey |
@@ -19,7 +18,6 @@ AUTOSTART = YES | |||
19 | PORT = 0 | 18 | PORT = 0 |
20 | HOSTNAME = localhost | 19 | HOSTNAME = localhost |
21 | HOME = $SERVICEHOME | 20 | HOME = $SERVICEHOME |
22 | CONFIG = $DEFAULTCONFIG | ||
23 | BINARY = gnunet-service-dns | 21 | BINARY = gnunet-service-dns |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | ACCEPT_FROM6 = ::1; | 23 | ACCEPT_FROM6 = ::1; |
@@ -31,7 +29,6 @@ AUTOSTART = YES | |||
31 | PORT = 20071 | 29 | PORT = 20071 |
32 | HOSTNAME = localhost | 30 | HOSTNAME = localhost |
33 | HOME = $SERVICEHOME | 31 | HOME = $SERVICEHOME |
34 | CONFIG = $DEFAULTCONFIG | ||
35 | BINARY = gnunet-service-resolver | 32 | BINARY = gnunet-service-resolver |
36 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
37 | ACCEPT_FROM6 = ::1; | 34 | ACCEPT_FROM6 = ::1; |
@@ -44,7 +41,6 @@ AUTOSTART = YES | |||
44 | PORT = 20070 | 41 | PORT = 20070 |
45 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
46 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
47 | CONFIG = $DEFAULTCONFIG | ||
48 | BINARY = gnunet-service-mesh | 44 | BINARY = gnunet-service-mesh |
49 | ACCEPT_FROM = 127.0.0.1; | 45 | ACCEPT_FROM = 127.0.0.1; |
50 | ACCEPT_FROM6 = ::1; | 46 | ACCEPT_FROM6 = ::1; |
@@ -57,7 +53,6 @@ AUTOSTART = YES | |||
57 | PORT = 20069 | 53 | PORT = 20069 |
58 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
59 | HOME = $SERVICEHOME | 55 | HOME = $SERVICEHOME |
60 | CONFIG = $DEFAULTCONFIG | ||
61 | BINARY = gnunet-service-nse | 56 | BINARY = gnunet-service-nse |
62 | ACCEPT_FROM = 127.0.0.1; | 57 | ACCEPT_FROM = 127.0.0.1; |
63 | ACCEPT_FROM6 = ::1; | 58 | ACCEPT_FROM6 = ::1; |
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO | |||
76 | AUTOCONNECT = YES | 71 | AUTOCONNECT = YES |
77 | TARGET-CONNECTION-COUNT = 16 | 72 | TARGET-CONNECTION-COUNT = 16 |
78 | FRIENDS = $SERVICEHOME/friends | 73 | FRIENDS = $SERVICEHOME/friends |
79 | CONFIG = $DEFAULTCONFIG | ||
80 | BINARY = gnunet-daemon-topology | 74 | BINARY = gnunet-daemon-topology |
81 | 75 | ||
82 | [datastore] | 76 | [datastore] |
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES | |||
87 | PORT = 20068 | 81 | PORT = 20068 |
88 | HOSTNAME = localhost | 82 | HOSTNAME = localhost |
89 | HOME = $SERVICEHOME | 83 | HOME = $SERVICEHOME |
90 | CONFIG = $DEFAULTCONFIG | ||
91 | BINARY = gnunet-service-datastore | 84 | BINARY = gnunet-service-datastore |
92 | ACCEPT_FROM = 127.0.0.1; | 85 | ACCEPT_FROM = 127.0.0.1; |
93 | ACCEPT_FROM6 = ::1; | 86 | ACCEPT_FROM6 = ::1; |
@@ -110,7 +103,6 @@ AUTOSTART = YES | |||
110 | PORT = 20067 | 103 | PORT = 20067 |
111 | HOSTNAME = localhost | 104 | HOSTNAME = localhost |
112 | HOME = $SERVICEHOME | 105 | HOME = $SERVICEHOME |
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-peerinfo | 106 | BINARY = gnunet-service-peerinfo |
115 | ACCEPT_FROM = 127.0.0.1; | 107 | ACCEPT_FROM = 127.0.0.1; |
116 | ACCEPT_FROM6 = ::1; | 108 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20066 | 123 | PORT = 20066 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -153,7 +144,6 @@ AUTOSTART = YES | |||
153 | PORT = 20065 | 144 | PORT = 20065 |
154 | HOSTNAME = localhost | 145 | HOSTNAME = localhost |
155 | HOME = $SERVICEHOME | 146 | HOME = $SERVICEHOME |
156 | CONFIG = $DEFAULTCONFIG | ||
157 | BINARY = gnunet-service-transport | 147 | BINARY = gnunet-service-transport |
158 | NEIGHBOUR_LIMIT = 50 | 148 | NEIGHBOUR_LIMIT = 50 |
159 | ACCEPT_FROM = 127.0.0.1; | 149 | ACCEPT_FROM = 127.0.0.1; |
@@ -205,7 +195,6 @@ AUTOSTART = NO | |||
205 | PORT = 20060 | 195 | PORT = 20060 |
206 | HOSTNAME = localhost | 196 | HOSTNAME = localhost |
207 | HOME = $SERVICEHOME | 197 | HOME = $SERVICEHOME |
208 | CONFIG = $DEFAULTCONFIG | ||
209 | BINARY = gnunet-service-template | 198 | BINARY = gnunet-service-template |
210 | ACCEPT_FROM = 127.0.0.1; | 199 | ACCEPT_FROM = 127.0.0.1; |
211 | ACCEPT_FROM6 = ::1; | 200 | ACCEPT_FROM6 = ::1; |
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
223 | PORT = 20059 | 212 | PORT = 20059 |
224 | HOSTNAME = localhost | 213 | HOSTNAME = localhost |
225 | HOME = $SERVICEHOME | 214 | HOME = $SERVICEHOME |
226 | CONFIG = $DEFAULTCONFIG | ||
227 | BINARY = gnunet-service-fs | 215 | BINARY = gnunet-service-fs |
228 | ACCEPT_FROM = 127.0.0.1; | 216 | ACCEPT_FROM = 127.0.0.1; |
229 | ACCEPT_FROM6 = ::1; | 217 | ACCEPT_FROM6 = ::1; |
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
238 | EXPECTED_NEIGHBOUR_COUNT = 128 | 226 | EXPECTED_NEIGHBOUR_COUNT = 128 |
239 | 227 | ||
240 | [vpn] | 228 | [vpn] |
241 | CONFIG = $DEFAULTCONFIG | ||
242 | BINARY = gnunet-daemon-vpn | 229 | BINARY = gnunet-daemon-vpn |
243 | IPV6ADDR = 1234::1 | 230 | IPV6ADDR = 1234::1 |
244 | IPV6PREFIX = 32 | 231 | IPV6PREFIX = 32 |
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 | |||
249 | IFNAME = vpn-gnunet | 236 | IFNAME = vpn-gnunet |
250 | 237 | ||
251 | [exit] | 238 | [exit] |
252 | CONFIG = $DEFAULTCONFIG | ||
253 | BINARY = gnunet-daemon-exit | 239 | BINARY = gnunet-daemon-exit |
254 | IPV6ADDR = 1234:1::1 | 240 | IPV6ADDR = 1234:1::1 |
255 | IPV6PREFIX = 32 | 241 | IPV6PREFIX = 32 |
@@ -264,7 +250,6 @@ AUTOSTART = YES | |||
264 | PORT = 0 | 250 | PORT = 0 |
265 | HOSTNAME = localhost | 251 | HOSTNAME = localhost |
266 | HOME = $SERVICEHOME | 252 | HOME = $SERVICEHOME |
267 | CONFIG = $DEFAULTCONFIG | ||
268 | BINARY = gnunet-service-dns | 253 | BINARY = gnunet-service-dns |
269 | ACCEPT_FROM = 127.0.0.1; | 254 | ACCEPT_FROM = 127.0.0.1; |
270 | ACCEPT_FROM6 = ::1; | 255 | ACCEPT_FROM6 = ::1; |
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO | |||
275 | PORT = 20058 | 260 | PORT = 20058 |
276 | HOSTNAME = localhost | 261 | HOSTNAME = localhost |
277 | HOME = $SERVICEHOME | 262 | HOME = $SERVICEHOME |
278 | CONFIG = $DEFAULTCONFIG | ||
279 | BINARY = gnunet-service-arm | 263 | BINARY = gnunet-service-arm |
280 | ACCEPT_FROM = 127.0.0.1; | 264 | ACCEPT_FROM = 127.0.0.1; |
281 | ACCEPT_FROM6 = ::1; | 265 | ACCEPT_FROM6 = ::1; |
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES | |||
288 | HTTPPORT = 8080 | 272 | HTTPPORT = 8080 |
289 | HOME = $SERVICEHOME | 273 | HOME = $SERVICEHOME |
290 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 274 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
291 | CONFIG = $DEFAULTCONFIG | ||
292 | BINARY = gnunet-daemon-hostlist | 275 | BINARY = gnunet-daemon-hostlist |
293 | OPTIONS = -b | 276 | OPTIONS = -b |
294 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ | 277 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ |
@@ -299,7 +282,6 @@ AUTOSTART = YES | |||
299 | PORT = 20057 | 282 | PORT = 20057 |
300 | HOSTNAME = localhost | 283 | HOSTNAME = localhost |
301 | HOME = $SERVICEHOME | 284 | HOME = $SERVICEHOME |
302 | CONFIG = $DEFAULTCONFIG | ||
303 | BINARY = gnunet-service-core | 285 | BINARY = gnunet-service-core |
304 | ACCEPT_FROM = 127.0.0.1; | 286 | ACCEPT_FROM = 127.0.0.1; |
305 | ACCEPT_FROM6 = ::1; | 287 | ACCEPT_FROM6 = ::1; |
@@ -333,7 +315,6 @@ AUTOSTART = YES | |||
333 | PORT = 20055 | 315 | PORT = 20055 |
334 | HOSTNAME = localhost | 316 | HOSTNAME = localhost |
335 | HOME = $SERVICEHOME | 317 | HOME = $SERVICEHOME |
336 | CONFIG = $DEFAULTCONFIG | ||
337 | BINARY = gnunet-service-statistics | 318 | BINARY = gnunet-service-statistics |
338 | ACCEPT_FROM = 127.0.0.1; | 319 | ACCEPT_FROM = 127.0.0.1; |
339 | ACCEPT_FROM6 = ::1; | 320 | ACCEPT_FROM6 = ::1; |
@@ -346,7 +327,6 @@ AUTOSTART = YES | |||
346 | PORT = 20054 | 327 | PORT = 20054 |
347 | HOSTNAME = localhost | 328 | HOSTNAME = localhost |
348 | HOME = $SERVICEHOME | 329 | HOME = $SERVICEHOME |
349 | CONFIG = $DEFAULTCONFIG | ||
350 | BINARY = gnunet-service-dht | 330 | BINARY = gnunet-service-dht |
351 | ACCEPT_FROM = 127.0.0.1; | 331 | ACCEPT_FROM = 127.0.0.1; |
352 | ACCEPT_FROM6 = ::1; | 332 | ACCEPT_FROM6 = ::1; |
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf index f515609bd..b94eecd8b 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_normal_client | 2 | SERVICEHOME = /tmp/c_normal_client |
3 | DEFAULTCONFIG = confs/c_normal_client_tcp_udp.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = hostkeys/0002-hostkey | 5 | HOSTKEY = hostkeys/0002-hostkey |
@@ -19,7 +18,6 @@ AUTOSTART = YES | |||
19 | PORT = 0 | 18 | PORT = 0 |
20 | HOSTNAME = localhost | 19 | HOSTNAME = localhost |
21 | HOME = $SERVICEHOME | 20 | HOME = $SERVICEHOME |
22 | CONFIG = $DEFAULTCONFIG | ||
23 | BINARY = gnunet-service-dns | 21 | BINARY = gnunet-service-dns |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | ACCEPT_FROM6 = ::1; | 23 | ACCEPT_FROM6 = ::1; |
@@ -31,7 +29,6 @@ AUTOSTART = YES | |||
31 | PORT = 20071 | 29 | PORT = 20071 |
32 | HOSTNAME = localhost | 30 | HOSTNAME = localhost |
33 | HOME = $SERVICEHOME | 31 | HOME = $SERVICEHOME |
34 | CONFIG = $DEFAULTCONFIG | ||
35 | BINARY = gnunet-service-resolver | 32 | BINARY = gnunet-service-resolver |
36 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
37 | ACCEPT_FROM6 = ::1; | 34 | ACCEPT_FROM6 = ::1; |
@@ -44,7 +41,6 @@ AUTOSTART = YES | |||
44 | PORT = 20070 | 41 | PORT = 20070 |
45 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
46 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
47 | CONFIG = $DEFAULTCONFIG | ||
48 | BINARY = gnunet-service-mesh | 44 | BINARY = gnunet-service-mesh |
49 | ACCEPT_FROM = 127.0.0.1; | 45 | ACCEPT_FROM = 127.0.0.1; |
50 | ACCEPT_FROM6 = ::1; | 46 | ACCEPT_FROM6 = ::1; |
@@ -57,7 +53,6 @@ AUTOSTART = YES | |||
57 | PORT = 20069 | 53 | PORT = 20069 |
58 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
59 | HOME = $SERVICEHOME | 55 | HOME = $SERVICEHOME |
60 | CONFIG = $DEFAULTCONFIG | ||
61 | BINARY = gnunet-service-nse | 56 | BINARY = gnunet-service-nse |
62 | ACCEPT_FROM = 127.0.0.1; | 57 | ACCEPT_FROM = 127.0.0.1; |
63 | ACCEPT_FROM6 = ::1; | 58 | ACCEPT_FROM6 = ::1; |
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO | |||
76 | AUTOCONNECT = YES | 71 | AUTOCONNECT = YES |
77 | TARGET-CONNECTION-COUNT = 16 | 72 | TARGET-CONNECTION-COUNT = 16 |
78 | FRIENDS = $SERVICEHOME/friends | 73 | FRIENDS = $SERVICEHOME/friends |
79 | CONFIG = $DEFAULTCONFIG | ||
80 | BINARY = gnunet-daemon-topology | 74 | BINARY = gnunet-daemon-topology |
81 | 75 | ||
82 | [datastore] | 76 | [datastore] |
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES | |||
87 | PORT = 20068 | 81 | PORT = 20068 |
88 | HOSTNAME = localhost | 82 | HOSTNAME = localhost |
89 | HOME = $SERVICEHOME | 83 | HOME = $SERVICEHOME |
90 | CONFIG = $DEFAULTCONFIG | ||
91 | BINARY = gnunet-service-datastore | 84 | BINARY = gnunet-service-datastore |
92 | ACCEPT_FROM = 127.0.0.1; | 85 | ACCEPT_FROM = 127.0.0.1; |
93 | ACCEPT_FROM6 = ::1; | 86 | ACCEPT_FROM6 = ::1; |
@@ -110,7 +103,6 @@ AUTOSTART = YES | |||
110 | PORT = 20067 | 103 | PORT = 20067 |
111 | HOSTNAME = localhost | 104 | HOSTNAME = localhost |
112 | HOME = $SERVICEHOME | 105 | HOME = $SERVICEHOME |
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-peerinfo | 106 | BINARY = gnunet-service-peerinfo |
115 | ACCEPT_FROM = 127.0.0.1; | 107 | ACCEPT_FROM = 127.0.0.1; |
116 | ACCEPT_FROM6 = ::1; | 108 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20066 | 123 | PORT = 20066 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -153,7 +144,6 @@ AUTOSTART = YES | |||
153 | PORT = 20065 | 144 | PORT = 20065 |
154 | HOSTNAME = localhost | 145 | HOSTNAME = localhost |
155 | HOME = $SERVICEHOME | 146 | HOME = $SERVICEHOME |
156 | CONFIG = $DEFAULTCONFIG | ||
157 | BINARY = gnunet-service-transport | 147 | BINARY = gnunet-service-transport |
158 | NEIGHBOUR_LIMIT = 50 | 148 | NEIGHBOUR_LIMIT = 50 |
159 | ACCEPT_FROM = 127.0.0.1; | 149 | ACCEPT_FROM = 127.0.0.1; |
@@ -205,7 +195,6 @@ AUTOSTART = NO | |||
205 | PORT = 20060 | 195 | PORT = 20060 |
206 | HOSTNAME = localhost | 196 | HOSTNAME = localhost |
207 | HOME = $SERVICEHOME | 197 | HOME = $SERVICEHOME |
208 | CONFIG = $DEFAULTCONFIG | ||
209 | BINARY = gnunet-service-template | 198 | BINARY = gnunet-service-template |
210 | ACCEPT_FROM = 127.0.0.1; | 199 | ACCEPT_FROM = 127.0.0.1; |
211 | ACCEPT_FROM6 = ::1; | 200 | ACCEPT_FROM6 = ::1; |
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
223 | PORT = 20059 | 212 | PORT = 20059 |
224 | HOSTNAME = localhost | 213 | HOSTNAME = localhost |
225 | HOME = $SERVICEHOME | 214 | HOME = $SERVICEHOME |
226 | CONFIG = $DEFAULTCONFIG | ||
227 | BINARY = gnunet-service-fs | 215 | BINARY = gnunet-service-fs |
228 | ACCEPT_FROM = 127.0.0.1; | 216 | ACCEPT_FROM = 127.0.0.1; |
229 | ACCEPT_FROM6 = ::1; | 217 | ACCEPT_FROM6 = ::1; |
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
238 | EXPECTED_NEIGHBOUR_COUNT = 128 | 226 | EXPECTED_NEIGHBOUR_COUNT = 128 |
239 | 227 | ||
240 | [vpn] | 228 | [vpn] |
241 | CONFIG = $DEFAULTCONFIG | ||
242 | BINARY = gnunet-daemon-vpn | 229 | BINARY = gnunet-daemon-vpn |
243 | IPV6ADDR = 1234::1 | 230 | IPV6ADDR = 1234::1 |
244 | IPV6PREFIX = 32 | 231 | IPV6PREFIX = 32 |
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 | |||
249 | IFNAME = vpn-gnunet | 236 | IFNAME = vpn-gnunet |
250 | 237 | ||
251 | [exit] | 238 | [exit] |
252 | CONFIG = $DEFAULTCONFIG | ||
253 | BINARY = gnunet-daemon-exit | 239 | BINARY = gnunet-daemon-exit |
254 | IPV6ADDR = 1234:1::1 | 240 | IPV6ADDR = 1234:1::1 |
255 | IPV6PREFIX = 32 | 241 | IPV6PREFIX = 32 |
@@ -264,7 +250,6 @@ AUTOSTART = YES | |||
264 | PORT = 0 | 250 | PORT = 0 |
265 | HOSTNAME = localhost | 251 | HOSTNAME = localhost |
266 | HOME = $SERVICEHOME | 252 | HOME = $SERVICEHOME |
267 | CONFIG = $DEFAULTCONFIG | ||
268 | BINARY = gnunet-service-dns | 253 | BINARY = gnunet-service-dns |
269 | ACCEPT_FROM = 127.0.0.1; | 254 | ACCEPT_FROM = 127.0.0.1; |
270 | ACCEPT_FROM6 = ::1; | 255 | ACCEPT_FROM6 = ::1; |
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO | |||
275 | PORT = 20058 | 260 | PORT = 20058 |
276 | HOSTNAME = localhost | 261 | HOSTNAME = localhost |
277 | HOME = $SERVICEHOME | 262 | HOME = $SERVICEHOME |
278 | CONFIG = $DEFAULTCONFIG | ||
279 | BINARY = gnunet-service-arm | 263 | BINARY = gnunet-service-arm |
280 | ACCEPT_FROM = 127.0.0.1; | 264 | ACCEPT_FROM = 127.0.0.1; |
281 | ACCEPT_FROM6 = ::1; | 265 | ACCEPT_FROM6 = ::1; |
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES | |||
288 | HTTPPORT = 8080 | 272 | HTTPPORT = 8080 |
289 | HOME = $SERVICEHOME | 273 | HOME = $SERVICEHOME |
290 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 274 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
291 | CONFIG = $DEFAULTCONFIG | ||
292 | BINARY = gnunet-daemon-hostlist | 275 | BINARY = gnunet-daemon-hostlist |
293 | OPTIONS = -b | 276 | OPTIONS = -b |
294 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ | 277 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ |
@@ -299,7 +282,6 @@ AUTOSTART = YES | |||
299 | PORT = 20057 | 282 | PORT = 20057 |
300 | HOSTNAME = localhost | 283 | HOSTNAME = localhost |
301 | HOME = $SERVICEHOME | 284 | HOME = $SERVICEHOME |
302 | CONFIG = $DEFAULTCONFIG | ||
303 | BINARY = gnunet-service-core | 285 | BINARY = gnunet-service-core |
304 | ACCEPT_FROM = 127.0.0.1; | 286 | ACCEPT_FROM = 127.0.0.1; |
305 | ACCEPT_FROM6 = ::1; | 287 | ACCEPT_FROM6 = ::1; |
@@ -333,7 +315,6 @@ AUTOSTART = YES | |||
333 | PORT = 20055 | 315 | PORT = 20055 |
334 | HOSTNAME = localhost | 316 | HOSTNAME = localhost |
335 | HOME = $SERVICEHOME | 317 | HOME = $SERVICEHOME |
336 | CONFIG = $DEFAULTCONFIG | ||
337 | BINARY = gnunet-service-statistics | 318 | BINARY = gnunet-service-statistics |
338 | ACCEPT_FROM = 127.0.0.1; | 319 | ACCEPT_FROM = 127.0.0.1; |
339 | ACCEPT_FROM6 = ::1; | 320 | ACCEPT_FROM6 = ::1; |
@@ -346,7 +327,6 @@ AUTOSTART = YES | |||
346 | PORT = 20054 | 327 | PORT = 20054 |
347 | HOSTNAME = localhost | 328 | HOSTNAME = localhost |
348 | HOME = $SERVICEHOME | 329 | HOME = $SERVICEHOME |
349 | CONFIG = $DEFAULTCONFIG | ||
350 | BINARY = gnunet-service-dht | 330 | BINARY = gnunet-service-dht |
351 | ACCEPT_FROM = 127.0.0.1; | 331 | ACCEPT_FROM = 127.0.0.1; |
352 | ACCEPT_FROM6 = ::1; | 332 | ACCEPT_FROM6 = ::1; |
@@ -367,4 +347,4 @@ UNIX_MATCH_GID = YES | |||
367 | 347 | ||
368 | [dhtcache] | 348 | [dhtcache] |
369 | DATABASE = sqlite | 349 | DATABASE = sqlite |
370 | QUOTA = 1 MB \ No newline at end of file | 350 | QUOTA = 1 MB |
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf index a4a30c18c..c887bdae0 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_normal_client | 2 | SERVICEHOME = /tmp/c_normal_client |
3 | DEFAULTCONFIG = confs/c_normal_client_tcp_udp_http.conf | ||
4 | 3 | ||
5 | [gnunetd] | 4 | [gnunetd] |
6 | HOSTKEY = hostkeys/0002-hostkey | 5 | HOSTKEY = hostkeys/0002-hostkey |
@@ -19,7 +18,6 @@ AUTOSTART = YES | |||
19 | PORT = 0 | 18 | PORT = 0 |
20 | HOSTNAME = localhost | 19 | HOSTNAME = localhost |
21 | HOME = $SERVICEHOME | 20 | HOME = $SERVICEHOME |
22 | CONFIG = $DEFAULTCONFIG | ||
23 | BINARY = gnunet-service-dns | 21 | BINARY = gnunet-service-dns |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | ACCEPT_FROM6 = ::1; | 23 | ACCEPT_FROM6 = ::1; |
@@ -31,7 +29,6 @@ AUTOSTART = YES | |||
31 | PORT = 20071 | 29 | PORT = 20071 |
32 | HOSTNAME = localhost | 30 | HOSTNAME = localhost |
33 | HOME = $SERVICEHOME | 31 | HOME = $SERVICEHOME |
34 | CONFIG = $DEFAULTCONFIG | ||
35 | BINARY = gnunet-service-resolver | 32 | BINARY = gnunet-service-resolver |
36 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
37 | ACCEPT_FROM6 = ::1; | 34 | ACCEPT_FROM6 = ::1; |
@@ -44,7 +41,6 @@ AUTOSTART = YES | |||
44 | PORT = 20070 | 41 | PORT = 20070 |
45 | HOSTNAME = localhost | 42 | HOSTNAME = localhost |
46 | HOME = $SERVICEHOME | 43 | HOME = $SERVICEHOME |
47 | CONFIG = $DEFAULTCONFIG | ||
48 | BINARY = gnunet-service-mesh | 44 | BINARY = gnunet-service-mesh |
49 | ACCEPT_FROM = 127.0.0.1; | 45 | ACCEPT_FROM = 127.0.0.1; |
50 | ACCEPT_FROM6 = ::1; | 46 | ACCEPT_FROM6 = ::1; |
@@ -57,7 +53,6 @@ AUTOSTART = YES | |||
57 | PORT = 20069 | 53 | PORT = 20069 |
58 | HOSTNAME = localhost | 54 | HOSTNAME = localhost |
59 | HOME = $SERVICEHOME | 55 | HOME = $SERVICEHOME |
60 | CONFIG = $DEFAULTCONFIG | ||
61 | BINARY = gnunet-service-nse | 56 | BINARY = gnunet-service-nse |
62 | ACCEPT_FROM = 127.0.0.1; | 57 | ACCEPT_FROM = 127.0.0.1; |
63 | ACCEPT_FROM6 = ::1; | 58 | ACCEPT_FROM6 = ::1; |
@@ -76,7 +71,6 @@ FRIENDS-ONLY = NO | |||
76 | AUTOCONNECT = YES | 71 | AUTOCONNECT = YES |
77 | TARGET-CONNECTION-COUNT = 16 | 72 | TARGET-CONNECTION-COUNT = 16 |
78 | FRIENDS = $SERVICEHOME/friends | 73 | FRIENDS = $SERVICEHOME/friends |
79 | CONFIG = $DEFAULTCONFIG | ||
80 | BINARY = gnunet-daemon-topology | 74 | BINARY = gnunet-daemon-topology |
81 | 75 | ||
82 | [datastore] | 76 | [datastore] |
@@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES | |||
87 | PORT = 20068 | 81 | PORT = 20068 |
88 | HOSTNAME = localhost | 82 | HOSTNAME = localhost |
89 | HOME = $SERVICEHOME | 83 | HOME = $SERVICEHOME |
90 | CONFIG = $DEFAULTCONFIG | ||
91 | BINARY = gnunet-service-datastore | 84 | BINARY = gnunet-service-datastore |
92 | ACCEPT_FROM = 127.0.0.1; | 85 | ACCEPT_FROM = 127.0.0.1; |
93 | ACCEPT_FROM6 = ::1; | 86 | ACCEPT_FROM6 = ::1; |
@@ -110,7 +103,6 @@ AUTOSTART = YES | |||
110 | PORT = 20067 | 103 | PORT = 20067 |
111 | HOSTNAME = localhost | 104 | HOSTNAME = localhost |
112 | HOME = $SERVICEHOME | 105 | HOME = $SERVICEHOME |
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-peerinfo | 106 | BINARY = gnunet-service-peerinfo |
115 | ACCEPT_FROM = 127.0.0.1; | 107 | ACCEPT_FROM = 127.0.0.1; |
116 | ACCEPT_FROM6 = ::1; | 108 | ACCEPT_FROM6 = ::1; |
@@ -131,7 +123,6 @@ AUTOSTART = YES | |||
131 | PORT = 20066 | 123 | PORT = 20066 |
132 | HOSTNAME = localhost | 124 | HOSTNAME = localhost |
133 | HOME = $SERVICEHOME | 125 | HOME = $SERVICEHOME |
134 | CONFIG = $DEFAULTCONFIG | ||
135 | BINARY = gnunet-service-ats | 126 | BINARY = gnunet-service-ats |
136 | ACCEPT_FROM = 127.0.0.1; | 127 | ACCEPT_FROM = 127.0.0.1; |
137 | ACCEPT_FROM6 = ::1; | 128 | ACCEPT_FROM6 = ::1; |
@@ -153,7 +144,6 @@ AUTOSTART = YES | |||
153 | PORT = 20065 | 144 | PORT = 20065 |
154 | HOSTNAME = localhost | 145 | HOSTNAME = localhost |
155 | HOME = $SERVICEHOME | 146 | HOME = $SERVICEHOME |
156 | CONFIG = $DEFAULTCONFIG | ||
157 | BINARY = gnunet-service-transport | 147 | BINARY = gnunet-service-transport |
158 | NEIGHBOUR_LIMIT = 50 | 148 | NEIGHBOUR_LIMIT = 50 |
159 | ACCEPT_FROM = 127.0.0.1; | 149 | ACCEPT_FROM = 127.0.0.1; |
@@ -205,7 +195,6 @@ AUTOSTART = NO | |||
205 | PORT = 20060 | 195 | PORT = 20060 |
206 | HOSTNAME = localhost | 196 | HOSTNAME = localhost |
207 | HOME = $SERVICEHOME | 197 | HOME = $SERVICEHOME |
208 | CONFIG = $DEFAULTCONFIG | ||
209 | BINARY = gnunet-service-template | 198 | BINARY = gnunet-service-template |
210 | ACCEPT_FROM = 127.0.0.1; | 199 | ACCEPT_FROM = 127.0.0.1; |
211 | ACCEPT_FROM6 = ::1; | 200 | ACCEPT_FROM6 = ::1; |
@@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ | |||
223 | PORT = 20059 | 212 | PORT = 20059 |
224 | HOSTNAME = localhost | 213 | HOSTNAME = localhost |
225 | HOME = $SERVICEHOME | 214 | HOME = $SERVICEHOME |
226 | CONFIG = $DEFAULTCONFIG | ||
227 | BINARY = gnunet-service-fs | 215 | BINARY = gnunet-service-fs |
228 | ACCEPT_FROM = 127.0.0.1; | 216 | ACCEPT_FROM = 127.0.0.1; |
229 | ACCEPT_FROM6 = ::1; | 217 | ACCEPT_FROM6 = ::1; |
@@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms | |||
238 | EXPECTED_NEIGHBOUR_COUNT = 128 | 226 | EXPECTED_NEIGHBOUR_COUNT = 128 |
239 | 227 | ||
240 | [vpn] | 228 | [vpn] |
241 | CONFIG = $DEFAULTCONFIG | ||
242 | BINARY = gnunet-daemon-vpn | 229 | BINARY = gnunet-daemon-vpn |
243 | IPV6ADDR = 1234::1 | 230 | IPV6ADDR = 1234::1 |
244 | IPV6PREFIX = 32 | 231 | IPV6PREFIX = 32 |
@@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 | |||
249 | IFNAME = vpn-gnunet | 236 | IFNAME = vpn-gnunet |
250 | 237 | ||
251 | [exit] | 238 | [exit] |
252 | CONFIG = $DEFAULTCONFIG | ||
253 | BINARY = gnunet-daemon-exit | 239 | BINARY = gnunet-daemon-exit |
254 | IPV6ADDR = 1234:1::1 | 240 | IPV6ADDR = 1234:1::1 |
255 | IPV6PREFIX = 32 | 241 | IPV6PREFIX = 32 |
@@ -264,7 +250,6 @@ AUTOSTART = YES | |||
264 | PORT = 0 | 250 | PORT = 0 |
265 | HOSTNAME = localhost | 251 | HOSTNAME = localhost |
266 | HOME = $SERVICEHOME | 252 | HOME = $SERVICEHOME |
267 | CONFIG = $DEFAULTCONFIG | ||
268 | BINARY = gnunet-service-dns | 253 | BINARY = gnunet-service-dns |
269 | ACCEPT_FROM = 127.0.0.1; | 254 | ACCEPT_FROM = 127.0.0.1; |
270 | ACCEPT_FROM6 = ::1; | 255 | ACCEPT_FROM6 = ::1; |
@@ -275,7 +260,6 @@ PROVIDE_EXIT = NO | |||
275 | PORT = 20058 | 260 | PORT = 20058 |
276 | HOSTNAME = localhost | 261 | HOSTNAME = localhost |
277 | HOME = $SERVICEHOME | 262 | HOME = $SERVICEHOME |
278 | CONFIG = $DEFAULTCONFIG | ||
279 | BINARY = gnunet-service-arm | 263 | BINARY = gnunet-service-arm |
280 | ACCEPT_FROM = 127.0.0.1; | 264 | ACCEPT_FROM = 127.0.0.1; |
281 | ACCEPT_FROM6 = ::1; | 265 | ACCEPT_FROM6 = ::1; |
@@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES | |||
288 | HTTPPORT = 8080 | 272 | HTTPPORT = 8080 |
289 | HOME = $SERVICEHOME | 273 | HOME = $SERVICEHOME |
290 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data | 274 | HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data |
291 | CONFIG = $DEFAULTCONFIG | ||
292 | BINARY = gnunet-daemon-hostlist | 275 | BINARY = gnunet-daemon-hostlist |
293 | OPTIONS = -b | 276 | OPTIONS = -b |
294 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ | 277 | SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ |
@@ -299,7 +282,6 @@ AUTOSTART = YES | |||
299 | PORT = 20057 | 282 | PORT = 20057 |
300 | HOSTNAME = localhost | 283 | HOSTNAME = localhost |
301 | HOME = $SERVICEHOME | 284 | HOME = $SERVICEHOME |
302 | CONFIG = $DEFAULTCONFIG | ||
303 | BINARY = gnunet-service-core | 285 | BINARY = gnunet-service-core |
304 | ACCEPT_FROM = 127.0.0.1; | 286 | ACCEPT_FROM = 127.0.0.1; |
305 | ACCEPT_FROM6 = ::1; | 287 | ACCEPT_FROM6 = ::1; |
@@ -333,7 +315,6 @@ AUTOSTART = YES | |||
333 | PORT = 20055 | 315 | PORT = 20055 |
334 | HOSTNAME = localhost | 316 | HOSTNAME = localhost |
335 | HOME = $SERVICEHOME | 317 | HOME = $SERVICEHOME |
336 | CONFIG = $DEFAULTCONFIG | ||
337 | BINARY = gnunet-service-statistics | 318 | BINARY = gnunet-service-statistics |
338 | ACCEPT_FROM = 127.0.0.1; | 319 | ACCEPT_FROM = 127.0.0.1; |
339 | ACCEPT_FROM6 = ::1; | 320 | ACCEPT_FROM6 = ::1; |
@@ -346,7 +327,6 @@ AUTOSTART = YES | |||
346 | PORT = 20054 | 327 | PORT = 20054 |
347 | HOSTNAME = localhost | 328 | HOSTNAME = localhost |
348 | HOME = $SERVICEHOME | 329 | HOME = $SERVICEHOME |
349 | CONFIG = $DEFAULTCONFIG | ||
350 | BINARY = gnunet-service-dht | 330 | BINARY = gnunet-service-dht |
351 | ACCEPT_FROM = 127.0.0.1; | 331 | ACCEPT_FROM = 127.0.0.1; |
352 | ACCEPT_FROM6 = ::1; | 332 | ACCEPT_FROM6 = ::1; |
@@ -367,4 +347,4 @@ UNIX_MATCH_GID = YES | |||
367 | 347 | ||
368 | [dhtcache] | 348 | [dhtcache] |
369 | DATABASE = sqlite | 349 | DATABASE = sqlite |
370 | QUOTA = 1 MB \ No newline at end of file | 350 | QUOTA = 1 MB |