Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Docs: Quote wildcard federation_certificate_verification_whitelist #11381

Merged
merged 3 commits into from
Nov 18, 2021
Merged

Docs: Quote wildcard federation_certificate_verification_whitelist #11381

merged 3 commits into from
Nov 18, 2021

Commits on Nov 17, 2021

  1. Quote wildcard federation_certificate_verification_whitelist

    Otherwise I get this beautiful stacktrace:
    
    ```
    python3 -m synapse.app.homeserver --config-path /etc/matrix/homeserver.yaml
    Traceback (most recent call last):
      File "/usr/lib/python3.8/runpy.py", line 194, in _run_module_as_main
        return _run_code(code, main_globals, None,
      File "/usr/lib/python3.8/runpy.py", line 87, in _run_code
        exec(code, run_globals)
      File "/root/synapse/synapse/app/homeserver.py", line 455, in <module>
        main()
      File "/root/synapse/synapse/app/homeserver.py", line 445, in main
        hs = setup(sys.argv[1:])
      File "/root/synapse/synapse/app/homeserver.py", line 345, in setup
        config = HomeServerConfig.load_or_generate_config(
      File "/root/synapse/synapse/config/_base.py", line 671, in load_or_generate_config
        config_dict = read_config_files(config_files)
      File "/root/synapse/synapse/config/_base.py", line 717, in read_config_files
        yaml_config = yaml.safe_load(file_stream)
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/__init__.py", line 125, in safe_load
        return load(stream, SafeLoader)
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/__init__.py", line 81, in load
        return loader.get_single_data()
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/constructor.py", line 49, in get_single_data
        node = self.get_single_node()
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/composer.py", line 36, in get_single_node
        document = self.compose_document()
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/composer.py", line 55, in compose_document
        node = self.compose_node(None, None)
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/composer.py", line 84, in compose_node
        node = self.compose_mapping_node(anchor)
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/composer.py", line 133, in compose_mapping_node
        item_value = self.compose_node(node, item_key)
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/composer.py", line 82, in compose_node
        node = self.compose_sequence_node(anchor)
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/composer.py", line 110, in compose_sequence_node
        while not self.check_event(SequenceEndEvent):
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/parser.py", line 98, in check_event
        self.current_event = self.state()
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/parser.py", line 379, in parse_block_sequence_first_entry
        return self.parse_block_sequence_entry()
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/parser.py", line 384, in parse_block_sequence_entry
        if not self.check_token(BlockEntryToken, BlockEndToken):
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/scanner.py", line 116, in check_token
        self.fetch_more_tokens()
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/scanner.py", line 227, in fetch_more_tokens
        return self.fetch_alias()
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/scanner.py", line 610, in fetch_alias
        self.tokens.append(self.scan_anchor(AliasToken))
      File "/root/synapse/env/lib/python3.8/site-packages/yaml/scanner.py", line 922, in scan_anchor
        raise ScannerError("while scanning an %s" % name, start_mark,
    yaml.scanner.ScannerError: while scanning an alias
      in "/etc/matrix/homeserver.yaml", line 614, column 5
    expected alphabetic or numeric character, but found '.'
      in "/etc/matrix/homeserver.yaml", line 614, column 6
    ```
    
    Signed-off-by: Nicolai Søborg <git@xn--sb-lka.org>
    NicolaiSoeborg committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    b8125f9 View commit details
    Browse the repository at this point in the history
  2. Add changelog file for PR 11381

    Signed-off-by: Nicolai Søborg <git@xn--sb-lka.org>
    NicolaiSoeborg committed Nov 17, 2021
    Configuration menu
    Copy the full SHA
    8e2457a View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2021

  1. Docs: Improve changelog

    Signed-off-by: Nicolai Søborg <git@xn--sb-lka.org>
    NicolaiSoeborg committed Nov 18, 2021
    Configuration menu
    Copy the full SHA
    370b72f View commit details
    Browse the repository at this point in the history