[tor-commits] [chutney/master] Rename some confusing hs v3 torrc templates

[teor at torproject.org]

commit ddcf53140faca00e9ebd96a95172589416c479dc
Author: teor <teor at torproject.org>
Date:   Sat Oct 6 16:36:18 2018 -0500

    Rename some confusing hs v3 torrc templates
    
    Closes #27969.
---
 networks/hs-v23-ipv6                                           | 2 +-
 networks/hs-v23-ipv6-md                                        | 2 +-
 networks/hs-v3-ipv6                                            | 2 +-
 networks/hs-v3-ipv6-md                                         | 2 +-
 torrc_templates/{hs3-only-v6-md.tmpl => hs-v3-only-v6-md.tmpl} | 0
 torrc_templates/{hs3-only-v6.tmpl => hs-v3-only-v6.tmpl}       | 0
 torrc_templates/{hs3-use-v6.tmpl => hs-v3-use-v6.tmpl}         | 0
 7 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/networks/hs-v23-ipv6 b/networks/hs-v23-ipv6
index a217be9..1154031 100644
--- a/networks/hs-v23-ipv6
+++ b/networks/hs-v23-ipv6
@@ -11,7 +11,7 @@ NonExitRelay6 = Node(tag="r", relay=1,
 Client = Node(tag="c", client=1, torrc="client.tmpl")
 Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6.tmpl")
-HSv3IPv6 = Node(tag="h", hs=1, torrc="hs3-only-v6.tmpl")
+HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6.tmpl")
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks
diff --git a/networks/hs-v23-ipv6-md b/networks/hs-v23-ipv6-md
index f562dd8..7349c4a 100644
--- a/networks/hs-v23-ipv6-md
+++ b/networks/hs-v23-ipv6-md
@@ -11,7 +11,7 @@ NonExitRelay6 = Node(tag="r", relay=1,
 Client = Node(tag="c", client=1, torrc="client.tmpl")
 Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl")
 HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6-md.tmpl")
-HSv3IPv6 = Node(tag="h", hs=1, torrc="hs3-only-v6-md.tmpl")
+HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl")
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks
diff --git a/networks/hs-v3-ipv6 b/networks/hs-v3-ipv6
index 2b9f63c..f262de3 100644
--- a/networks/hs-v3-ipv6
+++ b/networks/hs-v3-ipv6
@@ -10,7 +10,7 @@ NonExitRelay6 = Node(tag="r", relay=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.tmpl")
-HS6 = Node(tag="h", hs=1, torrc="hs3-only-v6.tmpl")
+HS6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6.tmpl")
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks
diff --git a/networks/hs-v3-ipv6-md b/networks/hs-v3-ipv6-md
index fc021d8..e83f351 100644
--- a/networks/hs-v3-ipv6-md
+++ b/networks/hs-v3-ipv6-md
@@ -10,7 +10,7 @@ NonExitRelay6 = Node(tag="r", relay=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")
-HS6 = Node(tag="h", hs=1, torrc="hs3-only-v6-md.tmpl")
+HS6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl")
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks
diff --git a/torrc_templates/hs3-only-v6-md.tmpl b/torrc_templates/hs-v3-only-v6-md.tmpl
similarity index 100%
rename from torrc_templates/hs3-only-v6-md.tmpl
rename to torrc_templates/hs-v3-only-v6-md.tmpl
diff --git a/torrc_templates/hs3-only-v6.tmpl b/torrc_templates/hs-v3-only-v6.tmpl
similarity index 100%
rename from torrc_templates/hs3-only-v6.tmpl
rename to torrc_templates/hs-v3-only-v6.tmpl
diff --git a/torrc_templates/hs3-use-v6.tmpl b/torrc_templates/hs-v3-use-v6.tmpl
similarity index 100%
rename from torrc_templates/hs3-use-v6.tmpl
rename to torrc_templates/hs-v3-use-v6.tmpl