[tor-commits] [chutney/master] Make sure IPv6 ORPorts are configured

[nickm at torproject.org]

commit 6ea3e64b9944a65956f1730c1117459af8969649
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jul 21 14:49:58 2020 -0400

    Make sure IPv6 ORPorts are configured
    
    Our exit-v6.tmpl should always have a v6 ORPort.
    
    Furthermore, bridges+ipv6-min network configuration now uses v6
    authorities and a v6 Exit. Without this, the IPv6 bridge self
    rechability test would never work.
    
    Closes #40007
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 networks/bridges+ipv6-min | 6 ++++--
 torrc_templates/exit-v6.i | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/networks/bridges+ipv6-min b/networks/bridges+ipv6-min
index a305b89..060a847 100644
--- a/networks/bridges+ipv6-min
+++ b/networks/bridges+ipv6-min
@@ -1,7 +1,9 @@
 Require("IPV6")
 # By default, Authorities are not configured as exits
-Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
-ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
+Authority = Node(tag="a", authority=1, relay=1, ipv6_addr="[::1]",
+                 torrc="authority-orport-v6.tmpl")
+ExitRelay = Node(tag="r", relay=1, exit=1, ipv6_addr="[::1]",
+                 torrc="relay.tmpl")
 
 BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1,
                        relay=1, torrc="bridgeauthority.tmpl")
diff --git a/torrc_templates/exit-v6.i b/torrc_templates/exit-v6.i
index bac1ba6..4bf5be8 100644
--- a/torrc_templates/exit-v6.i
+++ b/torrc_templates/exit-v6.i
@@ -1,3 +1,5 @@
+${include:orport-v6.i}
+
 # Must be included after relay-non-exit.tmpl
 ExitRelay 1