Kaynağa Gözat

Merge pull request #2803 from apexive/main

make smtp tls configurable / optional
pull/2804/head
Slavi Pantaleev 2 yıl önce
committed by GitHub
ebeveyn
işleme
f5d5a9a995
Veri tabanında bu imza için bilinen anahtar bulunamadı GPG Anahtar Kimliği: 4AEE18F83AFDEB23
3 değiştirilmiş dosya ile 5 ekleme ve 1 silme
  1. +1
    -0
      .gitignore
  2. +1
    -1
      roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
  3. +3
    -0
      roles/custom/matrix-synapse/vars/main.yml

+ 1
- 0
.gitignore Dosyayı Görüntüle

@@ -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


+ 1
- 1
roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 Dosyayı Görüntüle

@@ -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.


+ 3
- 0
roles/custom/matrix-synapse/vars/main.yml Dosyayı Görüntüle

@@ -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.
# #


Yükleniyor…
İptal
Kaydet