commit 052a9dc07aa9284b2f170c141adff47e2c4afad5 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 15 10:59:06 2020 -0400 Remove all unused chutney templates and include files. Out of the 68 files in the torrc_templates directory, only 32 are used by Tor or Chutney for testing. I'm removing the extraneous ones in order to reduce our maintenance burden. We can restore any of these that I was wrong about. --- torrc_templates/authority-bwfile.tmpl | 2 -- torrc_templates/authority-exit.tmpl | 2 -- torrc_templates/authority-orport-v6-exit.tmpl | 7 ------- torrc_templates/bridge-obfs2.tmpl | 6 ------ torrc_templates/bridge-obfs4.tmpl | 6 ------ torrc_templates/bridgeauthority-exit.tmpl | 2 -- torrc_templates/bridgeclient-obfs2.tmpl | 3 --- torrc_templates/bridgeclient-obfs4.tmpl | 3 --- torrc_templates/client-only-v6.i | 6 ------ torrc_templates/client-only-v6.tmpl | 2 -- torrc_templates/client-use-v6.i | 3 --- torrc_templates/client-use-v6.tmpl | 2 -- torrc_templates/hs-only-v6.tmpl | 3 --- torrc_templates/hs-use-v6.tmpl | 3 --- torrc_templates/hs-v3-10.tmpl | 2 -- torrc_templates/hs-v3-only-v6.tmpl | 3 --- torrc_templates/hs-v3-use-v6.tmpl | 3 --- torrc_templates/hs0.tmpl | 2 -- torrc_templates/hs1.tmpl | 2 -- torrc_templates/hs10.tmpl | 2 -- torrc_templates/hs2.tmpl | 2 -- torrc_templates/hs3.tmpl | 2 -- torrc_templates/hs4.tmpl | 2 -- torrc_templates/hs5.tmpl | 2 -- torrc_templates/hs6.tmpl | 2 -- torrc_templates/hs7.tmpl | 2 -- torrc_templates/hs8.tmpl | 2 -- torrc_templates/hs9.tmpl | 2 -- torrc_templates/relay-exit-v4-only.tmpl | 6 ------ torrc_templates/relay-orport-v6-exit.tmpl | 10 ---------- torrc_templates/single-onion-indirect.tmpl | 6 ------ torrc_templates/single-onion-only-v6.tmpl | 3 --- torrc_templates/single-onion-use-v6.tmpl | 3 --- torrc_templates/single-onion-v3-indirect.tmpl | 6 ------ torrc_templates/single-onion-v3-only-v6.tmpl | 3 --- torrc_templates/single-onion-v3-use-v6.tmpl | 3 --- 36 files changed, 120 deletions(-) diff --git a/torrc_templates/authority-bwfile.tmpl b/torrc_templates/authority-bwfile.tmpl deleted file mode 100644 index 1411773..0000000 --- a/torrc_templates/authority-bwfile.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:authority.tmpl} -V3BandwidthsFile /tmp/bwfile diff --git a/torrc_templates/authority-exit.tmpl b/torrc_templates/authority-exit.tmpl deleted file mode 100644 index 6826845..0000000 --- a/torrc_templates/authority-exit.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:relay.tmpl} -${include:authority.i} diff --git a/torrc_templates/authority-orport-v6-exit.tmpl b/torrc_templates/authority-orport-v6-exit.tmpl deleted file mode 100644 index 326315b..0000000 --- a/torrc_templates/authority-orport-v6-exit.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -${include:authority-orport-v6.tmpl} - -# An authority that's also 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} diff --git a/torrc_templates/bridge-obfs2.tmpl b/torrc_templates/bridge-obfs2.tmpl deleted file mode 100644 index 80baf2c..0000000 --- a/torrc_templates/bridge-obfs2.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -${include:bridge.tmpl} - -ServerTransportPlugin obfs2 exec ${path:obfs4proxy} -ExtOrPort $extorport -ServerTransportListenAddr obfs2 ${ip}:${ptport} - diff --git a/torrc_templates/bridge-obfs4.tmpl b/torrc_templates/bridge-obfs4.tmpl deleted file mode 100644 index e9b40bf..0000000 --- a/torrc_templates/bridge-obfs4.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -${include:bridge.tmpl} - -ServerTransportPlugin obfs4 exec ${path:obfs4proxy} -ExtOrPort $extorport -ServerTransportListenAddr obfs4 ${ip}:${ptport} - diff --git a/torrc_templates/bridgeauthority-exit.tmpl b/torrc_templates/bridgeauthority-exit.tmpl deleted file mode 100644 index 5837657..0000000 --- a/torrc_templates/bridgeauthority-exit.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:relay.tmpl} -${include:bridgeauthority.i} diff --git a/torrc_templates/bridgeclient-obfs2.tmpl b/torrc_templates/bridgeclient-obfs2.tmpl deleted file mode 100644 index 37513bb..0000000 --- a/torrc_templates/bridgeclient-obfs2.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:bridgeclient.tmpl} - -ClientTransportPlugin obfs2 exec ${path:obfs4proxy} diff --git a/torrc_templates/bridgeclient-obfs4.tmpl b/torrc_templates/bridgeclient-obfs4.tmpl deleted file mode 100644 index 403d2f6..0000000 --- a/torrc_templates/bridgeclient-obfs4.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:bridgeclient.tmpl} - -ClientTransportPlugin obfs4 exec ${path:obfs4proxy} diff --git a/torrc_templates/client-only-v6.i b/torrc_templates/client-only-v6.i deleted file mode 100644 index 985f237..0000000 --- a/torrc_templates/client-only-v6.i +++ /dev/null @@ -1,6 +0,0 @@ -# A client that only uses IPv6 ORPorts -${include:client-only-v6-md.i} - -# Due to Tor bug #19608, microdescriptors can't be used by IPv6-only clients -# running tor 0.2.9 and earlier -UseMicrodescriptors 0 diff --git a/torrc_templates/client-only-v6.tmpl b/torrc_templates/client-only-v6.tmpl deleted file mode 100644 index 79bd74b..0000000 --- a/torrc_templates/client-only-v6.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:client.tmpl} -${include:client-only-v6.i} diff --git a/torrc_templates/client-use-v6.i b/torrc_templates/client-use-v6.i deleted file mode 100644 index 8fff310..0000000 --- a/torrc_templates/client-use-v6.i +++ /dev/null @@ -1,3 +0,0 @@ -# A client that uses and prefers IPv6 -ClientUseIPv6 1 -ClientPreferIPv6ORPort 1 diff --git a/torrc_templates/client-use-v6.tmpl b/torrc_templates/client-use-v6.tmpl deleted file mode 100644 index 1659a39..0000000 --- a/torrc_templates/client-use-v6.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:client.tmpl} -${include:client-use-v6.i} diff --git a/torrc_templates/hs-only-v6.tmpl b/torrc_templates/hs-only-v6.tmpl deleted file mode 100644 index d487e8c..0000000 --- a/torrc_templates/hs-only-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:hs.tmpl} -# Hidden services are just another kind of client -${include:client-only-v6.i} diff --git a/torrc_templates/hs-use-v6.tmpl b/torrc_templates/hs-use-v6.tmpl deleted file mode 100644 index b3ff7a7..0000000 --- a/torrc_templates/hs-use-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:hs.tmpl} -# Hidden services are just another kind of client -${include:client-use-v6.i} diff --git a/torrc_templates/hs-v3-10.tmpl b/torrc_templates/hs-v3-10.tmpl deleted file mode 100644 index 0be6ef1..0000000 --- a/torrc_templates/hs-v3-10.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs-v3.tmpl} -HiddenServiceNumIntroductionPoints 10 diff --git a/torrc_templates/hs-v3-only-v6.tmpl b/torrc_templates/hs-v3-only-v6.tmpl deleted file mode 100644 index 0ff8759..0000000 --- a/torrc_templates/hs-v3-only-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:hs-v3.tmpl} -# Hidden services are just another kind of client -${include:client-only-v6.i} diff --git a/torrc_templates/hs-v3-use-v6.tmpl b/torrc_templates/hs-v3-use-v6.tmpl deleted file mode 100644 index 51e3700..0000000 --- a/torrc_templates/hs-v3-use-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:hs-v3.tmpl} -# Hidden services are just another kind of client -${include:client-use-v6.i} diff --git a/torrc_templates/hs0.tmpl b/torrc_templates/hs0.tmpl deleted file mode 100644 index bb5a9b5..0000000 --- a/torrc_templates/hs0.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 0 diff --git a/torrc_templates/hs1.tmpl b/torrc_templates/hs1.tmpl deleted file mode 100644 index 47948a9..0000000 --- a/torrc_templates/hs1.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 1 diff --git a/torrc_templates/hs10.tmpl b/torrc_templates/hs10.tmpl deleted file mode 100644 index e8758e6..0000000 --- a/torrc_templates/hs10.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 10 diff --git a/torrc_templates/hs2.tmpl b/torrc_templates/hs2.tmpl deleted file mode 100644 index b98cd39..0000000 --- a/torrc_templates/hs2.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 2 diff --git a/torrc_templates/hs3.tmpl b/torrc_templates/hs3.tmpl deleted file mode 100644 index a1dd6a4..0000000 --- a/torrc_templates/hs3.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 3 diff --git a/torrc_templates/hs4.tmpl b/torrc_templates/hs4.tmpl deleted file mode 100644 index 13d0aa4..0000000 --- a/torrc_templates/hs4.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 4 diff --git a/torrc_templates/hs5.tmpl b/torrc_templates/hs5.tmpl deleted file mode 100644 index 6d7544c..0000000 --- a/torrc_templates/hs5.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 5 diff --git a/torrc_templates/hs6.tmpl b/torrc_templates/hs6.tmpl deleted file mode 100644 index 8e3eff3..0000000 --- a/torrc_templates/hs6.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 6 diff --git a/torrc_templates/hs7.tmpl b/torrc_templates/hs7.tmpl deleted file mode 100644 index 7a57c4f..0000000 --- a/torrc_templates/hs7.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 7 diff --git a/torrc_templates/hs8.tmpl b/torrc_templates/hs8.tmpl deleted file mode 100644 index ce3c160..0000000 --- a/torrc_templates/hs8.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 8 diff --git a/torrc_templates/hs9.tmpl b/torrc_templates/hs9.tmpl deleted file mode 100644 index f287b13..0000000 --- a/torrc_templates/hs9.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -${include:hs.tmpl} -HiddenServiceNumIntroductionPoints 9 diff --git a/torrc_templates/relay-exit-v4-only.tmpl b/torrc_templates/relay-exit-v4-only.tmpl deleted file mode 100644 index ada1ca5..0000000 --- a/torrc_templates/relay-exit-v4-only.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -${include:relay-non-exit.tmpl} - -# An exit relay that can exit to IPv4 localhost only -# (newer versions of tor need this to be explicitly configured) - -${include:exit-v4.i} diff --git a/torrc_templates/relay-orport-v6-exit.tmpl b/torrc_templates/relay-orport-v6-exit.tmpl deleted file mode 100644 index 548c54f..0000000 --- a/torrc_templates/relay-orport-v6-exit.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -${include:relay.tmpl} - -# A relay that has an IPv6 ORPort -${include:orport-v6.i} - -# 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} diff --git a/torrc_templates/single-onion-indirect.tmpl b/torrc_templates/single-onion-indirect.tmpl deleted file mode 100644 index 58d812b..0000000 --- a/torrc_templates/single-onion-indirect.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -${include:single-onion.tmpl} - -# Only allow direct connections to the first directory authority's ORPort -# This checks that a single onion service makes 3-hop connections to -# unreachable intro points and rend points -ReachableAddresses 127.0.0.1:5000 diff --git a/torrc_templates/single-onion-only-v6.tmpl b/torrc_templates/single-onion-only-v6.tmpl deleted file mode 100644 index 8c72612..0000000 --- a/torrc_templates/single-onion-only-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:single-onion.tmpl} -# Onion services are just another kind of client -${include:client-only-v6.i} diff --git a/torrc_templates/single-onion-use-v6.tmpl b/torrc_templates/single-onion-use-v6.tmpl deleted file mode 100644 index d2db003..0000000 --- a/torrc_templates/single-onion-use-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:single-onion.tmpl} -# Onion services are just another kind of client -${include:client-use-v6.i} diff --git a/torrc_templates/single-onion-v3-indirect.tmpl b/torrc_templates/single-onion-v3-indirect.tmpl deleted file mode 100644 index 8cf6cd6..0000000 --- a/torrc_templates/single-onion-v3-indirect.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -${include:single-onion-v3.tmpl} - -# Only allow direct connections to the first directory authority's ORPort -# This checks that a single onion service makes 3-hop connections to -# unreachable intro points and rend points -ReachableAddresses 127.0.0.1:5000 diff --git a/torrc_templates/single-onion-v3-only-v6.tmpl b/torrc_templates/single-onion-v3-only-v6.tmpl deleted file mode 100644 index 7427cd7..0000000 --- a/torrc_templates/single-onion-v3-only-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:single-onion-v3.tmpl} -# Onion services are just another kind of client -${include:client-only-v6.i} diff --git a/torrc_templates/single-onion-v3-use-v6.tmpl b/torrc_templates/single-onion-v3-use-v6.tmpl deleted file mode 100644 index 25a6636..0000000 --- a/torrc_templates/single-onion-v3-use-v6.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -${include:single-onion-v3.tmpl} -# Onion services are just another kind of client -${include:client-use-v6.i}