commit 37947d1db7517f8ccf202ef6c4c4d7045b86f816 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 24 10:48:17 2020 -0400 Add multiple phases to single-onion-* network configurations These configurations seem to require the network to bootstrap for a bit before we have a working setup for the single onion services to publish. This is what our multi-phase code is for. --- networks/single-onion-v23 | 6 +++--- networks/single-onion-v23-ipv6-md | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/networks/single-onion-v23 b/networks/single-onion-v23 index f22fec6..2f3f524 100644 --- a/networks/single-onion-v23 +++ b/networks/single-onion-v23 @@ -1,9 +1,9 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -SingleOnionv2 = Node(tag="h", hs=1, torrc="single-onion.tmpl") -SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +SingleOnionv2 = Node(tag="h", hs=1, torrc="single-onion.tmpl", launch_phase=2) +SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl", launch_phase=2) # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/single-onion-v23-ipv6-md b/networks/single-onion-v23-ipv6-md index dff99ab..7c7580c 100644 --- a/networks/single-onion-v23-ipv6-md +++ b/networks/single-onion-v23-ipv6-md @@ -9,10 +9,10 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -SingleOnionv2IPv6 = Node(tag="h", hs=1, torrc="single-onion-only-v6-md.tmpl") -SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6-md.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl", launch_phase=2) +SingleOnionv2IPv6 = Node(tag="h", hs=1, torrc="single-onion-only-v6-md.tmpl",launch_phase=2) +SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6-md.tmpl", launch_phase=2) # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks