diff options
author | psyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet> | 2018-06-23 13:30:04 +0000 |
---|---|---|
committer | psyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet> | 1984-04-04 00:44:04 +0000 |
commit | c293f84ea192f361baf720a3979589c0e0881abc (patch) | |
tree | b936a8a074e0b4c4516746cf9ffb2ef77f6ed313 /src/testbed | |
parent | 8d43f2cb9c49e814544fcaa115c4b08bbac297c3 (diff) | |
download | gnunet-c293f84ea192f361baf720a3979589c0e0881abc.tar.gz gnunet-c293f84ea192f361baf720a3979589c0e0881abc.zip |
AUTOSTART renamed into START_ON_DEMAND (#4547a)
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/test_testbed_api_barriers.conf.in | 34 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_statistics.conf | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_template.conf | 4 | ||||
-rw-r--r-- | src/testbed/test_testbed_underlay.conf.in | 4 | ||||
-rw-r--r-- | src/testbed/testbed.conf.in | 10 |
5 files changed, 27 insertions, 27 deletions
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in index 8cad6df09..846b894c7 100644 --- a/src/testbed/test_testbed_api_barriers.conf.in +++ b/src/testbed/test_testbed_api_barriers.conf.in | |||
@@ -1,5 +1,5 @@ | |||
1 | [testbed] | 1 | [testbed] |
2 | AUTOSTART = NO | 2 | START_ON_DEMAND = NO |
3 | PORT = 12113 | 3 | PORT = 12113 |
4 | ACCEPT_FROM = 127.0.0.1; | 4 | ACCEPT_FROM = 127.0.0.1; |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
@@ -10,25 +10,25 @@ TOPOLOGY = RANDOM | |||
10 | PORT = 12366 | 10 | PORT = 12366 |
11 | 11 | ||
12 | [test-barriers] | 12 | [test-barriers] |
13 | AUTOSTART = NO | 13 | START_ON_DEMAND = NO |
14 | PORT = 12114 | 14 | PORT = 12114 |
15 | BINARY = /will/be/overwriten/in/test_testbed_api_barriers/ | 15 | BINARY = /will/be/overwriten/in/test_testbed_api_barriers/ |
16 | FORCESTART = YES | 16 | FORCESTART = YES |
17 | 17 | ||
18 | [fs] | 18 | [fs] |
19 | AUTOSTART = NO | 19 | START_ON_DEMAND = NO |
20 | FORCESTART = NO | 20 | FORCESTART = NO |
21 | 21 | ||
22 | [resolver] | 22 | [resolver] |
23 | HOSTNAME = localhost | 23 | HOSTNAME = localhost |
24 | AUTOSTART = NO | 24 | START_ON_DEMAND = NO |
25 | 25 | ||
26 | [cadet] | 26 | [cadet] |
27 | AUTOSTART = NO | 27 | START_ON_DEMAND = NO |
28 | FORCESTART = NO | 28 | FORCESTART = NO |
29 | 29 | ||
30 | [dht] | 30 | [dht] |
31 | AUTOSTART = NO | 31 | START_ON_DEMAND = NO |
32 | FORCESTART = NO | 32 | FORCESTART = NO |
33 | 33 | ||
34 | [dhtcache] | 34 | [dhtcache] |
@@ -49,7 +49,7 @@ WAN_QUOTA_IN = 3932160 | |||
49 | 49 | ||
50 | [core] | 50 | [core] |
51 | PORT = 12092 | 51 | PORT = 12092 |
52 | AUTOSTART = YES | 52 | START_ON_DEMAND = YES |
53 | FORCESTART = YES | 53 | FORCESTART = YES |
54 | USE_EPHEMERAL_KEYS = NO | 54 | USE_EPHEMERAL_KEYS = NO |
55 | 55 | ||
@@ -61,15 +61,15 @@ PORT = 12368 | |||
61 | GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/ | 61 | GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/ |
62 | 62 | ||
63 | [dns] | 63 | [dns] |
64 | AUTOSTART = NO | 64 | START_ON_DEMAND = NO |
65 | FORCESTART = NO | 65 | FORCESTART = NO |
66 | 66 | ||
67 | [nse] | 67 | [nse] |
68 | AUTOSTART = NO | 68 | START_ON_DEMAND = NO |
69 | FORCESTART = NO | 69 | FORCESTART = NO |
70 | 70 | ||
71 | [vpn] | 71 | [vpn] |
72 | AUTOSTART = NO | 72 | START_ON_DEMAND = NO |
73 | FORCESTART = NO | 73 | FORCESTART = NO |
74 | 74 | ||
75 | [nat] | 75 | [nat] |
@@ -77,27 +77,27 @@ RETURN_LOCAL_ADDRESSES = YES | |||
77 | FORCESTART = NO | 77 | FORCESTART = NO |
78 | 78 | ||
79 | [gns-helper-service-w32] | 79 | [gns-helper-service-w32] |
80 | AUTOSTART = NO | 80 | START_ON_DEMAND = NO |
81 | 81 | ||
82 | [consensus] | 82 | [consensus] |
83 | AUTOSTART = NO | 83 | START_ON_DEMAND = NO |
84 | FORCESTART = NO | 84 | FORCESTART = NO |
85 | 85 | ||
86 | [gns] | 86 | [gns] |
87 | AUTOSTART = NO | 87 | START_ON_DEMAND = NO |
88 | FORCESTART = NO | 88 | FORCESTART = NO |
89 | 89 | ||
90 | [statistics] | 90 | [statistics] |
91 | AUTOSTART = NO | 91 | START_ON_DEMAND = NO |
92 | FORCESTART = NO | 92 | FORCESTART = NO |
93 | 93 | ||
94 | [peerinfo] | 94 | [peerinfo] |
95 | NO_IO = YES | 95 | NO_IO = YES |
96 | 96 | ||
97 | [set] | 97 | [set] |
98 | AUTOSTART = NO | 98 | START_ON_DEMAND = NO |
99 | FORCESTART = NO | 99 | FORCESTART = NO |
100 | 100 | ||
101 | [revocation] | 101 | [revocation] |
102 | AUTOSTART = NO | 102 | START_ON_DEMAND = NO |
103 | FORCESTART = NO \ No newline at end of file | 103 | FORCESTART = NO |
diff --git a/src/testbed/test_testbed_api_statistics.conf b/src/testbed/test_testbed_api_statistics.conf index 65366835d..50d3f2c04 100644 --- a/src/testbed/test_testbed_api_statistics.conf +++ b/src/testbed/test_testbed_api_statistics.conf | |||
@@ -5,5 +5,5 @@ OVERLAY_TOPOLOGY = 2D_TORUS | |||
5 | MAX_PARALLEL_SERVICE_CONNECTIONS = 2 | 5 | MAX_PARALLEL_SERVICE_CONNECTIONS = 2 |
6 | 6 | ||
7 | [statistics] | 7 | [statistics] |
8 | AUTOSTART = YES | 8 | START_ON_DEMAND = YES |
9 | PORT = 30 | 9 | PORT = 30 |
diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf index 049829842..d893ba143 100644 --- a/src/testbed/test_testbed_api_template.conf +++ b/src/testbed/test_testbed_api_template.conf | |||
@@ -2,7 +2,7 @@ | |||
2 | @INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf | 2 | @INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf |
3 | 3 | ||
4 | [testbed] | 4 | [testbed] |
5 | AUTOSTART = NO | 5 | START_ON_DEMAND = NO |
6 | PORT = 12113 | 6 | PORT = 12113 |
7 | ACCEPT_FROM = 127.0.0.1; | 7 | ACCEPT_FROM = 127.0.0.1; |
8 | HOSTNAME = localhost | 8 | HOSTNAME = localhost |
@@ -22,7 +22,7 @@ FORCESTART = YES | |||
22 | 22 | ||
23 | # Transport requires resolver when connecting to a peer, so enable it | 23 | # Transport requires resolver when connecting to a peer, so enable it |
24 | [resolver] | 24 | [resolver] |
25 | AUTOSTART = YES | 25 | START_ON_DEMAND = YES |
26 | 26 | ||
27 | [ats] | 27 | [ats] |
28 | WAN_QUOTA_OUT = 3932160 | 28 | WAN_QUOTA_OUT = 3932160 |
diff --git a/src/testbed/test_testbed_underlay.conf.in b/src/testbed/test_testbed_underlay.conf.in index 5799b5253..b46716cde 100644 --- a/src/testbed/test_testbed_underlay.conf.in +++ b/src/testbed/test_testbed_underlay.conf.in | |||
@@ -5,9 +5,9 @@ OVERLAY_TOPOLOGY = LINE | |||
5 | OPERATION_TIMEOUT = 5 s | 5 | OPERATION_TIMEOUT = 5 s |
6 | 6 | ||
7 | [testbed-underlay] | 7 | [testbed-underlay] |
8 | AUTOSTART = NO | 8 | START_ON_DEMAND = NO |
9 | DBFILE = /will/be/overwritten/by/testcase | 9 | DBFILE = /will/be/overwritten/by/testcase |
10 | FORCESTART = YES | 10 | FORCESTART = YES |
11 | 11 | ||
12 | [dv] | 12 | [dv] |
13 | AUTOSTART = NO | 13 | START_ON_DEMAND = NO |
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in index 86044fbfb..c1d64b324 100644 --- a/src/testbed/testbed.conf.in +++ b/src/testbed/testbed.conf.in | |||
@@ -1,5 +1,5 @@ | |||
1 | [testbed] | 1 | [testbed] |
2 | AUTOSTART = NO | 2 | START_ON_DEMAND = NO |
3 | @JAVAPORT@ PORT = 2101 | 3 | @JAVAPORT@ PORT = 2101 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-testbed | 5 | BINARY = gnunet-service-testbed |
@@ -90,7 +90,7 @@ SHARED_SERVICES = | |||
90 | 90 | ||
91 | 91 | ||
92 | [testbed-barrier] | 92 | [testbed-barrier] |
93 | AUTOSTART = NO | 93 | START_ON_DEMAND = NO |
94 | @UNIXONLY@ PORT = 2103 | 94 | @UNIXONLY@ PORT = 2103 |
95 | HOSTNAME = localhost | 95 | HOSTNAME = localhost |
96 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock | 96 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock |
@@ -101,7 +101,7 @@ UNIX_MATCH_GID = YES | |||
101 | # This section is related to configuring underlay restrictions to simulate | 101 | # This section is related to configuring underlay restrictions to simulate |
102 | # connectivity restrictions of NAT boxes | 102 | # connectivity restrictions of NAT boxes |
103 | [testbed-underlay] | 103 | [testbed-underlay] |
104 | AUTOSTART = NO | 104 | START_ON_DEMAND = NO |
105 | NOARMBIND = YES | 105 | NOARMBIND = YES |
106 | BINARY = gnunet-daemon-testbed-underlay | 106 | BINARY = gnunet-daemon-testbed-underlay |
107 | # The sqlite3 database file containing information about what underlay | 107 | # The sqlite3 database file containing information about what underlay |
@@ -109,8 +109,8 @@ BINARY = gnunet-daemon-testbed-underlay | |||
109 | # DBFILE = | 109 | # DBFILE = |
110 | 110 | ||
111 | [latency-logger] | 111 | [latency-logger] |
112 | AUTOSTART = NO | 112 | START_ON_DEMAND = NO |
113 | NOARMBIND = YES | 113 | NOARMBIND = YES |
114 | BINARY = gnunet-daemon-latency-logger | 114 | BINARY = gnunet-daemon-latency-logger |
115 | # The sqlite3 database file where the latency values are to be stored | 115 | # The sqlite3 database file where the latency values are to be stored |
116 | # DBFILE = \ No newline at end of file | 116 | # DBFILE = |