diff options
-rw-r--r-- | src/core/test_core_api_peer1.conf | 7 | ||||
-rw-r--r-- | src/core/test_core_api_peer2.conf | 7 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_peer1.conf | 3 | ||||
-rw-r--r-- | src/transport/test_transport_api_http_peer1.conf | 8 | ||||
-rw-r--r-- | src/transport/test_transport_api_http_peer2.conf | 7 | ||||
-rw-r--r-- | src/transport/test_transport_api_tcp_peer1.conf | 8 | ||||
-rw-r--r-- | src/transport/test_transport_api_tcp_peer2.conf | 8 | ||||
-rw-r--r-- | src/transport/test_transport_api_udp_peer1.conf | 9 | ||||
-rw-r--r-- | src/transport/test_transport_api_udp_peer2.conf | 9 |
9 files changed, 16 insertions, 50 deletions
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf index e472238d7..a6888b683 100644 --- a/src/core/test_core_api_peer1.conf +++ b/src/core/test_core_api_peer1.conf | |||
@@ -45,3 +45,10 @@ PORT = 12470 | |||
45 | 45 | ||
46 | [testing] | 46 | [testing] |
47 | WEAKRANDOM = YES | 47 | WEAKRANDOM = YES |
48 | |||
49 | [fs] | ||
50 | AUTOSTART = NO | ||
51 | |||
52 | [datastore] | ||
53 | AUTOSTART = NO | ||
54 | |||
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf index b7de82d0f..9f7f89c0f 100644 --- a/src/core/test_core_api_peer2.conf +++ b/src/core/test_core_api_peer2.conf | |||
@@ -43,3 +43,10 @@ PORT = 22470 | |||
43 | 43 | ||
44 | [testing] | 44 | [testing] |
45 | WEAKRANDOM = YES | 45 | WEAKRANDOM = YES |
46 | |||
47 | [fs] | ||
48 | AUTOSTART = NO | ||
49 | |||
50 | [datastore] | ||
51 | AUTOSTART = NO | ||
52 | |||
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf index 2a46763bf..19874f022 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf | |||
@@ -53,4 +53,5 @@ DEBUG = NO | |||
53 | AUTOSTART = NO | 53 | AUTOSTART = NO |
54 | 54 | ||
55 | [datastore] | 55 | [datastore] |
56 | AUTOSTART = NO[fs] | 56 | AUTOSTART = NO |
57 | |||
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 2f9e3425d..1e458c346 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf | |||
@@ -3,7 +3,6 @@ | |||
3 | DEBUG=YES | 3 | DEBUG=YES |
4 | 4 | ||
5 | [fs] | 5 | [fs] |
6 | ALLOW_SHUTDOWN = YES | ||
7 | ACCEPT_FROM6 = ::1; | 6 | ACCEPT_FROM6 = ::1; |
8 | ACCEPT_FROM = 127.0.0.1; | 7 | ACCEPT_FROM = 127.0.0.1; |
9 | BINARY = gnunet-service-fs | 8 | BINARY = gnunet-service-fs |
@@ -20,7 +19,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db | |||
20 | DATABASE = sqlite | 19 | DATABASE = sqlite |
21 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | 20 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter |
22 | QUOTA = 100000000 | 21 | QUOTA = 100000000 |
23 | ALLOW_SHUTDOWN = YES | ||
24 | ACCEPT_FROM6 = ::1; | 22 | ACCEPT_FROM6 = ::1; |
25 | ACCEPT_FROM = 127.0.0.1; | 23 | ACCEPT_FROM = 127.0.0.1; |
26 | BINARY = gnunet-service-datastore | 24 | BINARY = gnunet-service-datastore |
@@ -53,7 +51,6 @@ PLUGINS = http | |||
53 | DEBUG = YES | 51 | DEBUG = YES |
54 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | 52 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args |
55 | #PREFIX = valgrind --leak-check=full | 53 | #PREFIX = valgrind --leak-check=full |
56 | ALLOW_SHUTDOWN = YES | ||
57 | ACCEPT_FROM6 = ::1; | 54 | ACCEPT_FROM6 = ::1; |
58 | ACCEPT_FROM = 127.0.0.1; | 55 | ACCEPT_FROM = 127.0.0.1; |
59 | NEIGHBOUR_LIMIT = 50 | 56 | NEIGHBOUR_LIMIT = 50 |
@@ -66,7 +63,6 @@ PORT = 12365 | |||
66 | [peerinfo] | 63 | [peerinfo] |
67 | TRUST = $SERVICEHOME/data/credit/ | 64 | TRUST = $SERVICEHOME/data/credit/ |
68 | HOSTS = $SERVICEHOME/data/hosts/ | 65 | HOSTS = $SERVICEHOME/data/hosts/ |
69 | ALLOW_SHUTDOWN = YES | ||
70 | ACCEPT_FROM6 = ::1; | 66 | ACCEPT_FROM6 = ::1; |
71 | ACCEPT_FROM = 127.0.0.1; | 67 | ACCEPT_FROM = 127.0.0.1; |
72 | BINARY = gnunet-service-peerinfo | 68 | BINARY = gnunet-service-peerinfo |
@@ -76,7 +72,6 @@ HOSTNAME = localhost | |||
76 | PORT = 12369 | 72 | PORT = 12369 |
77 | 73 | ||
78 | [resolver] | 74 | [resolver] |
79 | ALLOW_SHUTDOWN = YES | ||
80 | ACCEPT_FROM6 = ::1; | 75 | ACCEPT_FROM6 = ::1; |
81 | ACCEPT_FROM = 127.0.0.1; | 76 | ACCEPT_FROM = 127.0.0.1; |
82 | BINARY = gnunet-service-resolver | 77 | BINARY = gnunet-service-resolver |
@@ -86,7 +81,6 @@ HOSTNAME = localhost | |||
86 | PORT = 12364 | 81 | PORT = 12364 |
87 | 82 | ||
88 | [statistics] | 83 | [statistics] |
89 | ALLOW_SHUTDOWN = YES | ||
90 | ACCEPT_FROM6 = ::1; | 84 | ACCEPT_FROM6 = ::1; |
91 | ACCEPT_FROM = 127.0.0.1; | 85 | ACCEPT_FROM = 127.0.0.1; |
92 | BINARY = gnunet-service-statistics | 86 | BINARY = gnunet-service-statistics |
@@ -97,7 +91,6 @@ PORT = 12367 | |||
97 | 91 | ||
98 | [arm] | 92 | [arm] |
99 | DEFAULTSERVICES = | 93 | DEFAULTSERVICES = |
100 | ALLOW_SHUTDOWN = YES | ||
101 | ACCEPT_FROM6 = ::1; | 94 | ACCEPT_FROM6 = ::1; |
102 | ACCEPT_FROM = 127.0.0.1; | 95 | ACCEPT_FROM = 127.0.0.1; |
103 | BINARY = gnunet-service-arm | 96 | BINARY = gnunet-service-arm |
@@ -107,7 +100,6 @@ HOSTNAME = localhost | |||
107 | PORT = 12366 | 100 | PORT = 12366 |
108 | 101 | ||
109 | [transport-tcp] | 102 | [transport-tcp] |
110 | ALLOW_SHUTDOWN = NO | ||
111 | TIMEOUT = 300000 | 103 | TIMEOUT = 300000 |
112 | PORT = 12368 | 104 | PORT = 12368 |
113 | 105 | ||
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 44bb71f26..2d2cebec0 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf | |||
@@ -3,7 +3,6 @@ PORT = 22368 | |||
3 | DEBUG = YES | 3 | DEBUG = YES |
4 | 4 | ||
5 | [fs] | 5 | [fs] |
6 | ALLOW_SHUTDOWN = YES | ||
7 | ACCEPT_FROM6 = ::1; | 6 | ACCEPT_FROM6 = ::1; |
8 | ACCEPT_FROM = 127.0.0.1; | 7 | ACCEPT_FROM = 127.0.0.1; |
9 | BINARY = gnunet-service-fs | 8 | BINARY = gnunet-service-fs |
@@ -20,7 +19,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db | |||
20 | DATABASE = sqlite | 19 | DATABASE = sqlite |
21 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | 20 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter |
22 | QUOTA = 100000000 | 21 | QUOTA = 100000000 |
23 | ALLOW_SHUTDOWN = YES | ||
24 | ACCEPT_FROM6 = ::1; | 22 | ACCEPT_FROM6 = ::1; |
25 | ACCEPT_FROM = 127.0.0.1; | 23 | ACCEPT_FROM = 127.0.0.1; |
26 | BINARY = gnunet-service-datastore | 24 | BINARY = gnunet-service-datastore |
@@ -67,7 +65,6 @@ PORT = 22365 | |||
67 | [peerinfo] | 65 | [peerinfo] |
68 | TRUST = $SERVICEHOME/data/credit/ | 66 | TRUST = $SERVICEHOME/data/credit/ |
69 | HOSTS = $SERVICEHOME/data/hosts/ | 67 | HOSTS = $SERVICEHOME/data/hosts/ |
70 | ALLOW_SHUTDOWN = YES | ||
71 | ACCEPT_FROM6 = ::1; | 68 | ACCEPT_FROM6 = ::1; |
72 | ACCEPT_FROM = 127.0.0.1; | 69 | ACCEPT_FROM = 127.0.0.1; |
73 | BINARY = gnunet-service-peerinfo | 70 | BINARY = gnunet-service-peerinfo |
@@ -77,7 +74,6 @@ HOSTNAME = localhost | |||
77 | PORT = 22369 | 74 | PORT = 22369 |
78 | 75 | ||
79 | [resolver] | 76 | [resolver] |
80 | ALLOW_SHUTDOWN = YES | ||
81 | ACCEPT_FROM6 = ::1; | 77 | ACCEPT_FROM6 = ::1; |
82 | ACCEPT_FROM = 127.0.0.1; | 78 | ACCEPT_FROM = 127.0.0.1; |
83 | BINARY = gnunet-service-resolver | 79 | BINARY = gnunet-service-resolver |
@@ -87,7 +83,6 @@ HOSTNAME = localhost | |||
87 | PORT = 22364 | 83 | PORT = 22364 |
88 | 84 | ||
89 | [statistics] | 85 | [statistics] |
90 | ALLOW_SHUTDOWN = YES | ||
91 | ACCEPT_FROM6 = ::1; | 86 | ACCEPT_FROM6 = ::1; |
92 | ACCEPT_FROM = 127.0.0.1; | 87 | ACCEPT_FROM = 127.0.0.1; |
93 | BINARY = gnunet-service-statistics | 88 | BINARY = gnunet-service-statistics |
@@ -98,7 +93,6 @@ PORT = 22367 | |||
98 | 93 | ||
99 | [arm] | 94 | [arm] |
100 | DEFAULTSERVICES = | 95 | DEFAULTSERVICES = |
101 | ALLOW_SHUTDOWN = YES | ||
102 | ACCEPT_FROM6 = ::1; | 96 | ACCEPT_FROM6 = ::1; |
103 | ACCEPT_FROM = 127.0.0.1; | 97 | ACCEPT_FROM = 127.0.0.1; |
104 | BINARY = gnunet-service-arm | 98 | BINARY = gnunet-service-arm |
@@ -108,7 +102,6 @@ HOSTNAME = localhost | |||
108 | PORT = 22366 | 102 | PORT = 22366 |
109 | 103 | ||
110 | [transport-tcp] | 104 | [transport-tcp] |
111 | ALLOW_SHUTDOWN = NO | ||
112 | TIMEOUT = 300000 | 105 | TIMEOUT = 300000 |
113 | PORT = 22368 | 106 | PORT = 22368 |
114 | 107 | ||
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index 77902fd20..b1160070e 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | PORT = 12368 | 2 | PORT = 12368 |
3 | 3 | ||
4 | [fs] | 4 | [fs] |
5 | ALLOW_SHUTDOWN = YES | ||
6 | ACCEPT_FROM6 = ::1; | 5 | ACCEPT_FROM6 = ::1; |
7 | ACCEPT_FROM = 127.0.0.1; | 6 | ACCEPT_FROM = 127.0.0.1; |
8 | BINARY = gnunet-service-fs | 7 | BINARY = gnunet-service-fs |
@@ -19,7 +18,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db | |||
19 | DATABASE = sqlite | 18 | DATABASE = sqlite |
20 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | 19 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter |
21 | QUOTA = 100000000 | 20 | QUOTA = 100000000 |
22 | ALLOW_SHUTDOWN = YES | ||
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | BINARY = gnunet-service-datastore | 23 | BINARY = gnunet-service-datastore |
@@ -52,7 +50,6 @@ PLUGINS = tcp | |||
52 | #DEBUG = YES | 50 | #DEBUG = YES |
53 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args | 51 | #PREFIX = xterm -T transport2 -e gdb --command=cmd --args |
54 | #PREFIX = valgrind --leak-check=full | 52 | #PREFIX = valgrind --leak-check=full |
55 | ALLOW_SHUTDOWN = YES | ||
56 | ACCEPT_FROM6 = ::1; | 53 | ACCEPT_FROM6 = ::1; |
57 | ACCEPT_FROM = 127.0.0.1; | 54 | ACCEPT_FROM = 127.0.0.1; |
58 | NEIGHBOUR_LIMIT = 50 | 55 | NEIGHBOUR_LIMIT = 50 |
@@ -65,7 +62,6 @@ PORT = 12365 | |||
65 | [peerinfo] | 62 | [peerinfo] |
66 | TRUST = $SERVICEHOME/data/credit/ | 63 | TRUST = $SERVICEHOME/data/credit/ |
67 | HOSTS = $SERVICEHOME/data/hosts/ | 64 | HOSTS = $SERVICEHOME/data/hosts/ |
68 | ALLOW_SHUTDOWN = YES | ||
69 | ACCEPT_FROM6 = ::1; | 65 | ACCEPT_FROM6 = ::1; |
70 | ACCEPT_FROM = 127.0.0.1; | 66 | ACCEPT_FROM = 127.0.0.1; |
71 | BINARY = gnunet-service-peerinfo | 67 | BINARY = gnunet-service-peerinfo |
@@ -75,7 +71,6 @@ HOSTNAME = localhost | |||
75 | PORT = 12369 | 71 | PORT = 12369 |
76 | 72 | ||
77 | [resolver] | 73 | [resolver] |
78 | ALLOW_SHUTDOWN = YES | ||
79 | ACCEPT_FROM6 = ::1; | 74 | ACCEPT_FROM6 = ::1; |
80 | ACCEPT_FROM = 127.0.0.1; | 75 | ACCEPT_FROM = 127.0.0.1; |
81 | BINARY = gnunet-service-resolver | 76 | BINARY = gnunet-service-resolver |
@@ -85,7 +80,6 @@ HOSTNAME = localhost | |||
85 | PORT = 12364 | 80 | PORT = 12364 |
86 | 81 | ||
87 | [statistics] | 82 | [statistics] |
88 | ALLOW_SHUTDOWN = YES | ||
89 | ACCEPT_FROM6 = ::1; | 83 | ACCEPT_FROM6 = ::1; |
90 | ACCEPT_FROM = 127.0.0.1; | 84 | ACCEPT_FROM = 127.0.0.1; |
91 | BINARY = gnunet-service-statistics | 85 | BINARY = gnunet-service-statistics |
@@ -96,7 +90,6 @@ PORT = 12367 | |||
96 | 90 | ||
97 | [arm] | 91 | [arm] |
98 | DEFAULTSERVICES = | 92 | DEFAULTSERVICES = |
99 | ALLOW_SHUTDOWN = YES | ||
100 | ACCEPT_FROM6 = ::1; | 93 | ACCEPT_FROM6 = ::1; |
101 | ACCEPT_FROM = 127.0.0.1; | 94 | ACCEPT_FROM = 127.0.0.1; |
102 | BINARY = gnunet-service-arm | 95 | BINARY = gnunet-service-arm |
@@ -106,7 +99,6 @@ HOSTNAME = localhost | |||
106 | PORT = 12366 | 99 | PORT = 12366 |
107 | 100 | ||
108 | [transport-tcp] | 101 | [transport-tcp] |
109 | ALLOW_SHUTDOWN = NO | ||
110 | TIMEOUT = 300000 | 102 | TIMEOUT = 300000 |
111 | PORT = 12368 | 103 | PORT = 12368 |
112 | 104 | ||
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index a0cf25720..8c2fc23f0 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | PORT = 22368 | 2 | PORT = 22368 |
3 | 3 | ||
4 | [fs] | 4 | [fs] |
5 | ALLOW_SHUTDOWN = YES | ||
6 | ACCEPT_FROM6 = ::1; | 5 | ACCEPT_FROM6 = ::1; |
7 | ACCEPT_FROM = 127.0.0.1; | 6 | ACCEPT_FROM = 127.0.0.1; |
8 | BINARY = gnunet-service-fs | 7 | BINARY = gnunet-service-fs |
@@ -19,7 +18,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db | |||
19 | DATABASE = sqlite | 18 | DATABASE = sqlite |
20 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | 19 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter |
21 | QUOTA = 100000000 | 20 | QUOTA = 100000000 |
22 | ALLOW_SHUTDOWN = YES | ||
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | BINARY = gnunet-service-datastore | 23 | BINARY = gnunet-service-datastore |
@@ -51,7 +49,6 @@ MINIMUM-FRIENDS = 0 | |||
51 | PLUGINS = tcp | 49 | PLUGINS = tcp |
52 | #DEBUG = YES | 50 | #DEBUG = YES |
53 | # PREFIX = | 51 | # PREFIX = |
54 | ALLOW_SHUTDOWN = YES | ||
55 | ACCEPT_FROM6 = ::1; | 52 | ACCEPT_FROM6 = ::1; |
56 | ACCEPT_FROM = 127.0.0.1; | 53 | ACCEPT_FROM = 127.0.0.1; |
57 | NEIGHBOUR_LIMIT = 50 | 54 | NEIGHBOUR_LIMIT = 50 |
@@ -66,7 +63,6 @@ PORT = 22365 | |||
66 | [peerinfo] | 63 | [peerinfo] |
67 | TRUST = $SERVICEHOME/data/credit/ | 64 | TRUST = $SERVICEHOME/data/credit/ |
68 | HOSTS = $SERVICEHOME/data/hosts/ | 65 | HOSTS = $SERVICEHOME/data/hosts/ |
69 | ALLOW_SHUTDOWN = YES | ||
70 | ACCEPT_FROM6 = ::1; | 66 | ACCEPT_FROM6 = ::1; |
71 | ACCEPT_FROM = 127.0.0.1; | 67 | ACCEPT_FROM = 127.0.0.1; |
72 | BINARY = gnunet-service-peerinfo | 68 | BINARY = gnunet-service-peerinfo |
@@ -76,7 +72,6 @@ HOSTNAME = localhost | |||
76 | PORT = 22369 | 72 | PORT = 22369 |
77 | 73 | ||
78 | [resolver] | 74 | [resolver] |
79 | ALLOW_SHUTDOWN = YES | ||
80 | ACCEPT_FROM6 = ::1; | 75 | ACCEPT_FROM6 = ::1; |
81 | ACCEPT_FROM = 127.0.0.1; | 76 | ACCEPT_FROM = 127.0.0.1; |
82 | BINARY = gnunet-service-resolver | 77 | BINARY = gnunet-service-resolver |
@@ -86,7 +81,6 @@ HOSTNAME = localhost | |||
86 | PORT = 22364 | 81 | PORT = 22364 |
87 | 82 | ||
88 | [statistics] | 83 | [statistics] |
89 | ALLOW_SHUTDOWN = YES | ||
90 | ACCEPT_FROM6 = ::1; | 84 | ACCEPT_FROM6 = ::1; |
91 | ACCEPT_FROM = 127.0.0.1; | 85 | ACCEPT_FROM = 127.0.0.1; |
92 | BINARY = gnunet-service-statistics | 86 | BINARY = gnunet-service-statistics |
@@ -97,7 +91,6 @@ PORT = 22367 | |||
97 | 91 | ||
98 | [arm] | 92 | [arm] |
99 | DEFAULTSERVICES = | 93 | DEFAULTSERVICES = |
100 | ALLOW_SHUTDOWN = YES | ||
101 | ACCEPT_FROM6 = ::1; | 94 | ACCEPT_FROM6 = ::1; |
102 | ACCEPT_FROM = 127.0.0.1; | 95 | ACCEPT_FROM = 127.0.0.1; |
103 | BINARY = gnunet-service-arm | 96 | BINARY = gnunet-service-arm |
@@ -107,7 +100,6 @@ HOSTNAME = localhost | |||
107 | PORT = 22366 | 100 | PORT = 22366 |
108 | 101 | ||
109 | [transport-tcp] | 102 | [transport-tcp] |
110 | ALLOW_SHUTDOWN = NO | ||
111 | TIMEOUT = 300000 | 103 | TIMEOUT = 300000 |
112 | PORT = 22368 | 104 | PORT = 22368 |
113 | 105 | ||
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index e33b5de9a..aca0b69ab 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | PORT = 12368 | 2 | PORT = 12368 |
3 | 3 | ||
4 | [fs] | 4 | [fs] |
5 | ALLOW_SHUTDOWN = YES | ||
6 | ACCEPT_FROM6 = ::1; | 5 | ACCEPT_FROM6 = ::1; |
7 | ACCEPT_FROM = 127.0.0.1; | 6 | ACCEPT_FROM = 127.0.0.1; |
8 | BINARY = gnunet-service-fs | 7 | BINARY = gnunet-service-fs |
@@ -19,7 +18,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db | |||
19 | DATABASE = sqlite | 18 | DATABASE = sqlite |
20 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | 19 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter |
21 | QUOTA = 100000000 | 20 | QUOTA = 100000000 |
22 | ALLOW_SHUTDOWN = YES | ||
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | BINARY = gnunet-service-datastore | 23 | BINARY = gnunet-service-datastore |
@@ -50,7 +48,6 @@ MINIMUM-FRIENDS = 0 | |||
50 | [core] | 48 | [core] |
51 | TOTAL_QUOTA_OUT = 3932160 | 49 | TOTAL_QUOTA_OUT = 3932160 |
52 | TOTAL_QUOTA_IN = 3932160 | 50 | TOTAL_QUOTA_IN = 3932160 |
53 | ALLOW_SHUTDOWN = YES | ||
54 | ACCEPT_FROM6 = ::1; | 51 | ACCEPT_FROM6 = ::1; |
55 | ACCEPT_FROM = 127.0.0.1; | 52 | ACCEPT_FROM = 127.0.0.1; |
56 | BINARY = gnunet-service-core | 53 | BINARY = gnunet-service-core |
@@ -62,7 +59,6 @@ PORT = 2092 | |||
62 | [transport] | 59 | [transport] |
63 | PLUGINS = udp | 60 | PLUGINS = udp |
64 | DEBUG = NO | 61 | DEBUG = NO |
65 | ALLOW_SHUTDOWN = YES | ||
66 | ACCEPT_FROM6 = ::1; | 62 | ACCEPT_FROM6 = ::1; |
67 | ACCEPT_FROM = 127.0.0.1; | 63 | ACCEPT_FROM = 127.0.0.1; |
68 | NEIGHBOUR_LIMIT = 50 | 64 | NEIGHBOUR_LIMIT = 50 |
@@ -77,7 +73,6 @@ PORT = 12365 | |||
77 | [peerinfo] | 73 | [peerinfo] |
78 | TRUST = $SERVICEHOME/data/credit/ | 74 | TRUST = $SERVICEHOME/data/credit/ |
79 | HOSTS = $SERVICEHOME/data/hosts/ | 75 | HOSTS = $SERVICEHOME/data/hosts/ |
80 | ALLOW_SHUTDOWN = YES | ||
81 | ACCEPT_FROM6 = ::1; | 76 | ACCEPT_FROM6 = ::1; |
82 | ACCEPT_FROM = 127.0.0.1; | 77 | ACCEPT_FROM = 127.0.0.1; |
83 | BINARY = gnunet-service-peerinfo | 78 | BINARY = gnunet-service-peerinfo |
@@ -87,7 +82,6 @@ HOSTNAME = localhost | |||
87 | PORT = 12369 | 82 | PORT = 12369 |
88 | 83 | ||
89 | [resolver] | 84 | [resolver] |
90 | ALLOW_SHUTDOWN = YES | ||
91 | ACCEPT_FROM6 = ::1; | 85 | ACCEPT_FROM6 = ::1; |
92 | ACCEPT_FROM = 127.0.0.1; | 86 | ACCEPT_FROM = 127.0.0.1; |
93 | BINARY = gnunet-service-resolver | 87 | BINARY = gnunet-service-resolver |
@@ -97,7 +91,6 @@ HOSTNAME = localhost | |||
97 | PORT = 12364 | 91 | PORT = 12364 |
98 | 92 | ||
99 | [statistics] | 93 | [statistics] |
100 | ALLOW_SHUTDOWN = YES | ||
101 | ACCEPT_FROM6 = ::1; | 94 | ACCEPT_FROM6 = ::1; |
102 | ACCEPT_FROM = 127.0.0.1; | 95 | ACCEPT_FROM = 127.0.0.1; |
103 | BINARY = gnunet-service-statistics | 96 | BINARY = gnunet-service-statistics |
@@ -108,7 +101,6 @@ PORT = 12367 | |||
108 | 101 | ||
109 | [arm] | 102 | [arm] |
110 | DEFAULTSERVICES = | 103 | DEFAULTSERVICES = |
111 | ALLOW_SHUTDOWN = YES | ||
112 | ACCEPT_FROM6 = ::1; | 104 | ACCEPT_FROM6 = ::1; |
113 | ACCEPT_FROM = 127.0.0.1; | 105 | ACCEPT_FROM = 127.0.0.1; |
114 | BINARY = gnunet-service-arm | 106 | BINARY = gnunet-service-arm |
@@ -118,7 +110,6 @@ HOSTNAME = localhost | |||
118 | PORT = 12366 | 110 | PORT = 12366 |
119 | 111 | ||
120 | [transport-tcp] | 112 | [transport-tcp] |
121 | ALLOW_SHUTDOWN = NO | ||
122 | TIMEOUT = 300000 | 113 | TIMEOUT = 300000 |
123 | PORT = 12368 | 114 | PORT = 12368 |
124 | 115 | ||
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index f10aedd1f..264f2a508 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | PORT = 22368 | 2 | PORT = 22368 |
3 | 3 | ||
4 | [fs] | 4 | [fs] |
5 | ALLOW_SHUTDOWN = YES | ||
6 | ACCEPT_FROM6 = ::1; | 5 | ACCEPT_FROM6 = ::1; |
7 | ACCEPT_FROM = 127.0.0.1; | 6 | ACCEPT_FROM = 127.0.0.1; |
8 | BINARY = gnunet-service-fs | 7 | BINARY = gnunet-service-fs |
@@ -19,7 +18,6 @@ FILENAME = $SERVICEHOME/datastore/sqlite.db | |||
19 | DATABASE = sqlite | 18 | DATABASE = sqlite |
20 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter | 19 | BLOOMFILTER = $SERVICEHOME/fs/bloomfilter |
21 | QUOTA = 100000000 | 20 | QUOTA = 100000000 |
22 | ALLOW_SHUTDOWN = YES | ||
23 | ACCEPT_FROM6 = ::1; | 21 | ACCEPT_FROM6 = ::1; |
24 | ACCEPT_FROM = 127.0.0.1; | 22 | ACCEPT_FROM = 127.0.0.1; |
25 | BINARY = gnunet-service-datastore | 23 | BINARY = gnunet-service-datastore |
@@ -50,7 +48,6 @@ MINIMUM-FRIENDS = 0 | |||
50 | [core] | 48 | [core] |
51 | TOTAL_QUOTA_OUT = 3932160 | 49 | TOTAL_QUOTA_OUT = 3932160 |
52 | TOTAL_QUOTA_IN = 3932160 | 50 | TOTAL_QUOTA_IN = 3932160 |
53 | ALLOW_SHUTDOWN = YES | ||
54 | ACCEPT_FROM6 = ::1; | 51 | ACCEPT_FROM6 = ::1; |
55 | ACCEPT_FROM = 127.0.0.1; | 52 | ACCEPT_FROM = 127.0.0.1; |
56 | BINARY = gnunet-service-core | 53 | BINARY = gnunet-service-core |
@@ -63,7 +60,6 @@ PORT = 2092 | |||
63 | PLUGINS = udp | 60 | PLUGINS = udp |
64 | DEBUG = NO | 61 | DEBUG = NO |
65 | PREFIX = | 62 | PREFIX = |
66 | ALLOW_SHUTDOWN = YES | ||
67 | ACCEPT_FROM6 = ::1; | 63 | ACCEPT_FROM6 = ::1; |
68 | ACCEPT_FROM = 127.0.0.1; | 64 | ACCEPT_FROM = 127.0.0.1; |
69 | NEIGHBOUR_LIMIT = 50 | 65 | NEIGHBOUR_LIMIT = 50 |
@@ -77,7 +73,6 @@ PORT = 22365 | |||
77 | [peerinfo] | 73 | [peerinfo] |
78 | TRUST = $SERVICEHOME/data/credit/ | 74 | TRUST = $SERVICEHOME/data/credit/ |
79 | HOSTS = $SERVICEHOME/data/hosts/ | 75 | HOSTS = $SERVICEHOME/data/hosts/ |
80 | ALLOW_SHUTDOWN = YES | ||
81 | ACCEPT_FROM6 = ::1; | 76 | ACCEPT_FROM6 = ::1; |
82 | ACCEPT_FROM = 127.0.0.1; | 77 | ACCEPT_FROM = 127.0.0.1; |
83 | BINARY = gnunet-service-peerinfo | 78 | BINARY = gnunet-service-peerinfo |
@@ -87,7 +82,6 @@ HOSTNAME = localhost | |||
87 | PORT = 22369 | 82 | PORT = 22369 |
88 | 83 | ||
89 | [resolver] | 84 | [resolver] |
90 | ALLOW_SHUTDOWN = YES | ||
91 | ACCEPT_FROM6 = ::1; | 85 | ACCEPT_FROM6 = ::1; |
92 | ACCEPT_FROM = 127.0.0.1; | 86 | ACCEPT_FROM = 127.0.0.1; |
93 | BINARY = gnunet-service-resolver | 87 | BINARY = gnunet-service-resolver |
@@ -97,7 +91,6 @@ HOSTNAME = localhost | |||
97 | PORT = 22364 | 91 | PORT = 22364 |
98 | 92 | ||
99 | [statistics] | 93 | [statistics] |
100 | ALLOW_SHUTDOWN = YES | ||
101 | ACCEPT_FROM6 = ::1; | 94 | ACCEPT_FROM6 = ::1; |
102 | ACCEPT_FROM = 127.0.0.1; | 95 | ACCEPT_FROM = 127.0.0.1; |
103 | BINARY = gnunet-service-statistics | 96 | BINARY = gnunet-service-statistics |
@@ -108,7 +101,6 @@ PORT = 22367 | |||
108 | 101 | ||
109 | [arm] | 102 | [arm] |
110 | DEFAULTSERVICES = | 103 | DEFAULTSERVICES = |
111 | ALLOW_SHUTDOWN = YES | ||
112 | ACCEPT_FROM6 = ::1; | 104 | ACCEPT_FROM6 = ::1; |
113 | ACCEPT_FROM = 127.0.0.1; | 105 | ACCEPT_FROM = 127.0.0.1; |
114 | BINARY = gnunet-service-arm | 106 | BINARY = gnunet-service-arm |
@@ -118,7 +110,6 @@ HOSTNAME = localhost | |||
118 | PORT = 22366 | 110 | PORT = 22366 |
119 | 111 | ||
120 | [transport-tcp] | 112 | [transport-tcp] |
121 | ALLOW_SHUTDOWN = NO | ||
122 | TIMEOUT = 300000 | 113 | TIMEOUT = 300000 |
123 | PORT = 22368 | 114 | PORT = 22368 |
124 | 115 | ||