Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Make it clearer that the template dir is relative to synapse's root dir #5543

Merged
merged 11 commits into from
Jun 27, 2019
Merged

Make it clearer that the template dir is relative to synapse's root dir #5543

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
feb4b55
Make it clearer that the template dir is relative to synapse's root dir
anoadragon453 Jun 24, 2019
0ff3320
Add changelog
anoadragon453 Jun 24, 2019
0b64176
Fix sample config
anoadragon453 Jun 24, 2019
4ec2cb8
Remove whitespace at the end of sample config
anoadragon453 Jun 24, 2019
cc0ad07
Update changelog
anoadragon453 Jun 24, 2019
91fa5ea
Update with more information about the template_dir
anoadragon453 Jun 24, 2019
949c73d
Regen sample config
anoadragon453 Jun 24, 2019
3bd8b67
Remove debugging exception
anoadragon453 Jun 24, 2019
0ec9bb3
Fix sample config
anoadragon453 Jun 24, 2019
e77231d
better wording
anoadragon453 Jun 27, 2019
b2a65ed
sample config
anoadragon453 Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5543.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make the config clearer in that email.template_dir is relative to the Synapse's root directory, not the `synapse/` folder within it.
anoadragon453 marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion docs/sample_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,7 @@ password_config:
# # Template directory. All template files should be stored within this
# # directory
# #
# #template_dir: res/templates
# #template_dir: synapse/res/templates
#
# # Templates for email notifications
# #
Expand Down
2 changes: 1 addition & 1 deletion synapse/config/emailconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def default_config(self, config_dir_path, server_name, **kwargs):
# # Template directory. All template files should be stored within this
# # directory
# #
# #template_dir: res/templates
# #template_dir: synapse/res/templates
richvdh marked this conversation as resolved.
Show resolved Hide resolved
#
# # Templates for email notifications
# #
Expand Down