diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2017-01-18 14:38:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 14:38:49 +0000 |
| commit | 97d39183770a8c376261527d4766bdb9465e96b5 (patch) | |
| tree | 7507b844c5e032740a24b930069c41d706a340d8 /synapse/config | |
| parent | Merge pull request #1827 from matrix-org/dbkr/email_case_insensitive (diff) | |
| parent | Allow configuring the Riot URL used in notification emails (diff) | |
| download | synapse-97d39183770a8c376261527d4766bdb9465e96b5.tar.xz | |
Merge pull request #1811 from aperezdc/unhardcode-riot-urls
Allow configuring the Riot URL used in notification emails
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/emailconfig.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py index a187161272..0030b5db1e 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py @@ -68,6 +68,9 @@ class EmailConfig(Config): self.email_notif_for_new_users = email_config.get( "notif_for_new_users", True ) + self.email_riot_base_url = email_config.get( + "riot_base_url", None + ) if "app_name" in email_config: self.email_app_name = email_config["app_name"] else: @@ -85,6 +88,9 @@ class EmailConfig(Config): def default_config(self, config_dir_path, server_name, **kwargs): return """ # Enable sending emails for notification events + # Defining a custom URL for Riot is only needed if email notifications + # should contain links to a self-hosted installation of Riot; when set + # the "app_name" setting is ignored. #email: # enable_notifs: false # smtp_host: "localhost" @@ -95,4 +101,5 @@ class EmailConfig(Config): # notif_template_html: notif_mail.html # notif_template_text: notif_mail.txt # notif_for_new_users: True + # riot_base_url: "http://localhost/riot" """ |