Merge pull request #2803 from apexive/main

make smtp tls configurable / optional
This commit is contained in:
Slavi Pantaleev 2023-07-27 12:29:24 +03:00 committed by GitHub
commit f5d5a9a995
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions

1
.gitignore vendored
View File

@ -5,6 +5,7 @@
/roles/**/files/scratchpad /roles/**/files/scratchpad
.DS_Store .DS_Store
.python-version .python-version
.idea/
flake.lock flake.lock
# ignore roles pulled by ansible-galaxy # ignore roles pulled by ansible-galaxy

View File

@ -2351,7 +2351,7 @@ email:
# must present a certificate that is valid for 'smtp_host'. If this option # must present a certificate that is valid for 'smtp_host'. If this option
# is set to false, TLS will not be used. # is set to false, TLS will not be used.
# #
#enable_tls: false enable_tls: {{ matrix_synapse_email_smtp_enable_tls|to_json }}
# notif_from defines the "From" address to use when sending emails. # notif_from defines the "From" address to use when sending emails.
# It must be set if email sending is enabled. # It must be set if email sending is enabled.

View File

@ -5,6 +5,9 @@ matrix_synapse_federation_api_url_endpoint_public: "https://{{ matrix_server_fqn
matrix_synapse_media_store_directory_name: "{{ matrix_synapse_media_store_path | basename }}" matrix_synapse_media_store_directory_name: "{{ matrix_synapse_media_store_path | basename }}"
# Optionally: `false` to fully disable tls on outbound smtp
matrix_synapse_email_smtp_enable_tls: true
# A Synapse generic worker can handle both federation and client-server API endpoints. # A Synapse generic worker can handle both federation and client-server API endpoints.
# We wish to split these, as we normally serve federation separately and don't want them mixed up. # We wish to split these, as we normally serve federation separately and don't want them mixed up.
# #