mirror of
https://github.com/element-hq/synapse
synced 2024-09-12 11:45:11 +00:00
Remove now-redundant email config
This commit is contained in:
parent
91c8f828e1
commit
2e0d9219b9
2 changed files with 1 additions and 44 deletions
|
@ -1,42 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Copyright 2014, 2015 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 EmailConfig(Config):
|
|
||||||
|
|
||||||
def __init__(self, args):
|
|
||||||
super(EmailConfig, self).__init__(args)
|
|
||||||
self.email_from_address = args.email_from_address
|
|
||||||
self.email_smtp_server = args.email_smtp_server
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def add_arguments(cls, parser):
|
|
||||||
super(EmailConfig, cls).add_arguments(parser)
|
|
||||||
email_group = parser.add_argument_group("email")
|
|
||||||
email_group.add_argument(
|
|
||||||
"--email-from-address",
|
|
||||||
default="FROM@EXAMPLE.COM",
|
|
||||||
help="The address to send emails from (e.g. for password resets)."
|
|
||||||
)
|
|
||||||
email_group.add_argument(
|
|
||||||
"--email-smtp-server",
|
|
||||||
default="",
|
|
||||||
help=(
|
|
||||||
"The SMTP server to send emails from (e.g. for password"
|
|
||||||
" resets)."
|
|
||||||
)
|
|
||||||
)
|
|
|
@ -20,7 +20,6 @@ from .database import DatabaseConfig
|
||||||
from .ratelimiting import RatelimitConfig
|
from .ratelimiting import RatelimitConfig
|
||||||
from .repository import ContentRepositoryConfig
|
from .repository import ContentRepositoryConfig
|
||||||
from .captcha import CaptchaConfig
|
from .captcha import CaptchaConfig
|
||||||
from .email import EmailConfig
|
|
||||||
from .voip import VoipConfig
|
from .voip import VoipConfig
|
||||||
from .registration import RegistrationConfig
|
from .registration import RegistrationConfig
|
||||||
from .metrics import MetricsConfig
|
from .metrics import MetricsConfig
|
||||||
|
@ -29,7 +28,7 @@ from .appservice import AppServiceConfig
|
||||||
|
|
||||||
class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
|
class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
|
||||||
RatelimitConfig, ContentRepositoryConfig, CaptchaConfig,
|
RatelimitConfig, ContentRepositoryConfig, CaptchaConfig,
|
||||||
EmailConfig, VoipConfig, RegistrationConfig,
|
VoipConfig, RegistrationConfig,
|
||||||
MetricsConfig, AppServiceConfig,):
|
MetricsConfig, AppServiceConfig,):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue