diff options
| author | teor <teor@torproject.org> | 2018-12-07 13:23:57 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-12-07 16:30:24 +1000 |
| commit | 6bc5c06dc25630c5a5f97f1da2af29f88683d243 (patch) | |
| tree | b0e53b289506dc23dc0b69c9750db5406d4b39cd /scripts/maint/fallback.whitelist | |
| parent | 75b5cc047d3e257701de6dfab9f80d358025fb95 (diff) | |
| download | tor-6bc5c06dc25630c5a5f97f1da2af29f88683d243.tar.gz tor-6bc5c06dc25630c5a5f97f1da2af29f88683d243.zip | |
Fallbacks: accept relays that are a fuzzy match to the whitelist
If a relay matches at least one fingerprint, IPv4 address, or IPv6
address in the fallback whitelist, it can become a fallback. This
reduces the work required to keep the list up to date.
Closes ticket 28768.
Diffstat (limited to 'scripts/maint/fallback.whitelist')
| -rw-r--r-- | scripts/maint/fallback.whitelist | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 97291d73be..eb7fd92d4b 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -1,16 +1,18 @@ # updateFallbackDirs.py directory mirror whitelist - -# All attributes must match for the directory mirror to be included. -# If the fallback has an ipv6 key, the whitelist line must also have -# it, and vice versa, otherwise they don't match. - -# To replace this list with the hard-coded fallback list (for testing), use -# "updateFallbackDirs.py check_existing", or a command similar to: -# cat src/app/config/fallback_dirs.inc | grep \" | grep -v weight | \ -# tr -d '\n' | \ -# sed 's/"" / /g' | sed 's/""/"/g' | tr \" '\n' | grep -v '^$' \ -# > scripts/maint/fallback.whitelist - +# +# At least one of these keys must match for a directory mirror to be included +# in the fallback list: +# id +# ipv4 +# ipv6 +# The ports and nickname are ignored. Missing or extra ipv6 addresses +# are ignored. +# +# The latest relay details from Onionoo are included in the generated list. +# +# To check the hard-coded fallback list (for testing), use: +# $ updateFallbackDirs.py check_existing +# # If a relay operator wants their relay to be a FallbackDir, # enter the following information here: # <IPv4>:<DirPort> orport=<ORPort> id=<ID> ( ipv6=[<IPv6>]:<IPv6 ORPort> )? |