Commit ca8cd3e9 authored by David Goulet's avatar David Goulet 🤘
Browse files

template: Add relay-v6.tmpl

Let relay.tmpl be IPv4 only else we are forced to pass "ipv6_addr=" to
all templates. Without it, all IPv6 ORPorts end up with "None".

Instead, when we explicitly want a network with IPv6 support, use
relay-v6.tmpl which sets the IPv6 ORPort properly.

Fixese #40008

Signed-off-by: David Goulet's avatarDavid Goulet <dgoulet@torproject.org>
parent 6ea3e64b
......@@ -3,7 +3,7 @@ Require("IPV6")
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")
torrc="relay-v6.tmpl")
BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1,
relay=1, torrc="bridgeauthority.tmpl")
......
${include:relay-non-exit.tmpl}
# An exit relay that can exit to IPv6 localhost only
# (newer versions of tor need this to be explicitly configured)
${include:exit-v4.i}
${include:relay-v6.tmpl}
${include:relay-non-exit.tmpl}
# This file is named "relay.tmpl" for compatibility with previous
# chutney versions
# An exit relay that can exit to IPv4 & IPv6 localhost
# (newer versions of tor need this to be explicitly configured)
${include:exit-v4.i}
${include:exit-v6.i}
......@@ -3,8 +3,7 @@ ${include:relay-non-exit.tmpl}
# This file is named "relay.tmpl" for compatibility with previous
# chutney versions
# An exit relay that can exit to IPv4 & IPv6 localhost
# An exit relay that can exit to IPv4 localhost
# (newer versions of tor need this to be explicitly configured)
${include:exit-v4.i}
${include:exit-v6.i}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment