From 86364e6f0a06392c35461809cb82635c55a6bc37 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 7 Oct 2022 17:44:19 +0100 Subject: [PATCH] bridges config example: Add bridges section to example config This is precisely the text from the original version of !744. There is no implementation yet, so we must add a entry to the exception list in the tests. --- crates/arti/src/arti-example-config.toml | 21 +++++++++++++++++++++ crates/arti/src/cfg.rs | 3 +++ 2 files changed, 24 insertions(+) diff --git a/crates/arti/src/arti-example-config.toml b/crates/arti/src/arti-example-config.toml index 64ca1442a..385ae3127 100644 --- a/crates/arti/src/arti-example-config.toml +++ b/crates/arti/src/arti-example-config.toml @@ -114,6 +114,27 @@ # ignore_prefix = "/home/" #ignore_prefix = "" +# Bridges (for anticensorship support) +[bridges] + +# Should we use configured bridges? +# If set to false, we will ignore the configured bridges. +# If set to "auto", we will use any bridges that are configured. +# If set to true, bridges must be configured and will be used. +#enabled = "auto" + +# What bridges (including pluggable transports) to use: +# bridges = [ +# ": [ ...]", +# " :|- [...] [= ...]", +# ] +# You may specify all the bridge lines in one multi-line string: +# bridges = ''' +# : [...], +# :|- [...] [= ...], +# ''' +#bridges = [] + # Replacement values for consensus parameters. This is an advanced option # and you probably should leave it alone. Not all parameters are supported. # These are case-sensitive. diff --git a/crates/arti/src/cfg.rs b/crates/arti/src/cfg.rs index e6923faee..44daace36 100644 --- a/crates/arti/src/cfg.rs +++ b/crates/arti/src/cfg.rs @@ -306,6 +306,9 @@ mod test { "storage.permissions.trust_user", ]); + // TODO pt-client + known_unrecognized_options_new.extend(["bridges"]); + // The unrecognized options in new are those that are only new, plus those in all known_unrecognized_options_new.extend(known_unrecognized_options_all.clone());