Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-06 12:35:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove code generating comments in configuration file (#12941)

Browse source
This commit is contained in:
Shay 2022-06-14 07:53:42 -07:00 • committed by GitHub
parent 5f4ecf759d
commit 493c2fc44a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 66 additions and 5711 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/config/_base.py
View file

@ -18,6 +18,7 @@ import argparse
import errno
import logging
import os
import re
from collections import OrderedDict
from hashlib import sha256
from textwrap import dedent
@ -123,7 +124,10 @@ CONFIG_FILE_HEADER = """\
# should have the same indentation.
#
# [1] https://docs.ansible.com/ansible/latest/reference_appendices/YAMLSyntax.html
#
# For more information on how to configure Synapse, including a complete accounting of
# each option, go to docs/usage/configuration/config_documentation.md or
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html
"""
@ -470,7 +474,7 @@ class RootConfig:
The yaml config file
"""
return CONFIG_FILE_HEADER + "\n\n".join(
conf = CONFIG_FILE_HEADER + "\n".join(
dedent(conf)
for conf in self.invoke_all(
"generate_config_section",
@ -485,6 +489,8 @@ class RootConfig:
tls_private_key_path=tls_private_key_path,
).values()
)
conf = re.sub("\n{2,}", "\n", conf)
return conf
@classmethod
def load_config(