Add a warning about indentation to generated config (#6920)
Fixes #6916.
This commit is contained in:
parent
02e89021f5
commit
97a42bbc3a
|
@ -0,0 +1 @@
|
||||||
|
Add a warning about indentation to generated configuration files.
|
|
@ -1,4 +1,4 @@
|
||||||
# The config is maintained as an up-to-date snapshot of the default
|
# This file is maintained as an up-to-date snapshot of the default
|
||||||
# homeserver.yaml configuration generated by Synapse.
|
# homeserver.yaml configuration generated by Synapse.
|
||||||
#
|
#
|
||||||
# It is intended to act as a reference for the default configuration,
|
# It is intended to act as a reference for the default configuration,
|
||||||
|
@ -10,3 +10,5 @@
|
||||||
# homeserver.yaml. Instead, if you are starting from scratch, please generate
|
# homeserver.yaml. Instead, if you are starting from scratch, please generate
|
||||||
# a fresh config using Synapse by following the instructions in INSTALL.md.
|
# a fresh config using Synapse by following the instructions in INSTALL.md.
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# The config is maintained as an up-to-date snapshot of the default
|
# This file is maintained as an up-to-date snapshot of the default
|
||||||
# homeserver.yaml configuration generated by Synapse.
|
# homeserver.yaml configuration generated by Synapse.
|
||||||
#
|
#
|
||||||
# It is intended to act as a reference for the default configuration,
|
# It is intended to act as a reference for the default configuration,
|
||||||
|
@ -10,6 +10,16 @@
|
||||||
# homeserver.yaml. Instead, if you are starting from scratch, please generate
|
# homeserver.yaml. Instead, if you are starting from scratch, please generate
|
||||||
# a fresh config using Synapse by following the instructions in INSTALL.md.
|
# a fresh config using Synapse by following the instructions in INSTALL.md.
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
# Configuration file for Synapse.
|
||||||
|
#
|
||||||
|
# This is a YAML file: see [1] for a quick introduction. Note in particular
|
||||||
|
# that *indentation is important*: all the elements of a list or dictionary
|
||||||
|
# should have the same indentation.
|
||||||
|
#
|
||||||
|
# [1] https://docs.ansible.com/ansible/latest/reference_appendices/YAMLSyntax.html
|
||||||
|
|
||||||
## Server ##
|
## Server ##
|
||||||
|
|
||||||
# The domain name of the server, with optional explicit port.
|
# The domain name of the server, with optional explicit port.
|
||||||
|
|
|
@ -53,6 +53,18 @@ Missing mandatory `server_name` config option.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
CONFIG_FILE_HEADER = """\
|
||||||
|
# Configuration file for Synapse.
|
||||||
|
#
|
||||||
|
# This is a YAML file: see [1] for a quick introduction. Note in particular
|
||||||
|
# that *indentation is important*: all the elements of a list or dictionary
|
||||||
|
# should have the same indentation.
|
||||||
|
#
|
||||||
|
# [1] https://docs.ansible.com/ansible/latest/reference_appendices/YAMLSyntax.html
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
def path_exists(file_path):
|
def path_exists(file_path):
|
||||||
"""Check if a file exists
|
"""Check if a file exists
|
||||||
|
|
||||||
|
@ -344,7 +356,7 @@ class RootConfig(object):
|
||||||
str: the yaml config file
|
str: the yaml config file
|
||||||
"""
|
"""
|
||||||
|
|
||||||
return "\n\n".join(
|
return CONFIG_FILE_HEADER + "\n\n".join(
|
||||||
dedent(conf)
|
dedent(conf)
|
||||||
for conf in self.invoke_all(
|
for conf in self.invoke_all(
|
||||||
"generate_config_section",
|
"generate_config_section",
|
||||||
|
@ -574,8 +586,8 @@ class RootConfig(object):
|
||||||
if not path_exists(config_dir_path):
|
if not path_exists(config_dir_path):
|
||||||
os.makedirs(config_dir_path)
|
os.makedirs(config_dir_path)
|
||||||
with open(config_path, "w") as config_file:
|
with open(config_path, "w") as config_file:
|
||||||
config_file.write("# vim:ft=yaml\n\n")
|
|
||||||
config_file.write(config_str)
|
config_file.write(config_str)
|
||||||
|
config_file.write("\n\n# vim:ft=yaml")
|
||||||
|
|
||||||
config_dict = yaml.safe_load(config_str)
|
config_dict = yaml.safe_load(config_str)
|
||||||
obj.generate_missing_files(config_dict, config_dir_path)
|
obj.generate_missing_files(config_dict, config_dir_path)
|
||||||
|
|
Loading…
Reference in New Issue