mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-12-27 15:59:23 -05:00
fd463b4f5d
Make it so that most options in the config are optional, and commented out in the generated config. The reasons this is a good thing are as follows: * If we decide that we should change the default for an option, we can do so, and only those admins that have deliberately chosen to override that option will be stuck on the old setting. * It moves us towards a point where we can get rid of the super-surprising feature of synapse where the default settings for the config come from the generated yaml. * It makes setting up a test config for unit testing an order of magnitude easier (see forthcoming PR). * It makes the generated config more consistent, and hopefully easier for users to understand.
43 lines
1.4 KiB
Python
43 lines
1.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Copyright 2015, 2016 OpenMarket Ltd
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
from ._base import Config
|
|
|
|
|
|
class PasswordConfig(Config):
|
|
"""Password login configuration
|
|
"""
|
|
|
|
def read_config(self, config):
|
|
password_config = config.get("password_config", {})
|
|
if password_config is None:
|
|
password_config = {}
|
|
|
|
self.password_enabled = password_config.get("enabled", True)
|
|
self.password_pepper = password_config.get("pepper", "")
|
|
|
|
def default_config(self, config_dir_path, server_name, **kwargs):
|
|
return """\
|
|
password_config:
|
|
# Uncomment to disable password login
|
|
#
|
|
#enabled: false
|
|
|
|
# Uncomment and change to a secret random string for extra security.
|
|
# DO NOT CHANGE THIS AFTER INITIAL SETUP!
|
|
#
|
|
#pepper: "EVEN_MORE_SECRET"
|
|
"""
|