Implemented email setup for matrix

This commit is contained in:
Kevin Veen-Birkenbach 2023-12-19 16:03:19 +01:00
parent b3edba90e3
commit e23646cdc2
10 changed files with 36 additions and 17 deletions

View File

@ -2,9 +2,9 @@
BASEROW_PUBLIC_URL=https://{{ domain }} BASEROW_PUBLIC_URL=https://{{ domain }}
# Email Server Configuration # Email Server Configuration
EMAIL_SMTP=True EMAIL_SMTP={{ system_email_smtp | upper }}
EMAIL_SMTP_HOST={{ system_email_host }} EMAIL_SMTP_HOST={{ system_email_host }}
EMAIL_SMTP_PORT={{ system_email_port }} EMAIL_SMTP_PORT={{ system_email_smtp_port }}
EMAIL_SMTP_USER={{ system_email_username }} EMAIL_SMTP_USER={{ system_email_username }}
EMAIL_SMTP_PASSWORD={{ system_email_password }} EMAIL_SMTP_PASSWORD={{ system_email_password }}
EMAIL_SMTP_USE_TLS=tls EMAIL_SMTP_USE_TLS={{ system_email_tls | upper }}

View File

@ -197,12 +197,12 @@ ALLOW_GREENLIGHT_ACCOUNTS=true
SMTP_SERVER={{system_email_host}} SMTP_SERVER={{system_email_host}}
SMTP_DOMAIN={{domain}} SMTP_DOMAIN={{domain}}
SMTP_PORT={{system_email_port}} SMTP_PORT={{system_email_smtp_port}}
SMTP_USERNAME={{system_email_username}} SMTP_USERNAME={{system_email_username}}
SMTP_PASSWORD={{system_email_password}} SMTP_PASSWORD={{system_email_password}}
SMTP_AUTH=plain SMTP_AUTH=plain
SMTP_OPENSSL_VERIFY_MODE=none SMTP_OPENSSL_VERIFY_MODE=none
SMTP_STARTTLS_AUTO=true SMTP_STARTTLS_AUTO={{system_email_start_tls}}
SMTP_SENDER={{system_email_username}} SMTP_SENDER={{system_email_username}}
SMTP_SENDER_EMAIL={{system_email_username}} SMTP_SENDER_EMAIL={{system_email_username}}

View File

@ -64,10 +64,10 @@ env:
# SMTP ADDRESS, username, and password are required # SMTP ADDRESS, username, and password are required
# WARNING the char '#' in SMTP password can cause problems! # WARNING the char '#' in SMTP password can cause problems!
DISCOURSE_SMTP_ADDRESS: {{system_email_host}} DISCOURSE_SMTP_ADDRESS: {{system_email_host}}
DISCOURSE_SMTP_PORT: 587 DISCOURSE_SMTP_PORT: {{system_email_smtp_port}}
DISCOURSE_SMTP_USER_NAME: {{system_email}} DISCOURSE_SMTP_USER_NAME: {{system_email}}
DISCOURSE_SMTP_PASSWORD: {{system_email_password}} DISCOURSE_SMTP_PASSWORD: {{system_email_password}}
DISCOURSE_SMTP_ENABLE_START_TLS: true # (optional, default true) DISCOURSE_SMTP_ENABLE_START_TLS: {{ system_email_start_tls | upper }}
DISCOURSE_SMTP_DOMAIN: {{system_email_domain}} DISCOURSE_SMTP_DOMAIN: {{system_email_domain}}
DISCOURSE_NOTIFICATION_EMAIL: {{system_email}} DISCOURSE_NOTIFICATION_EMAIL: {{system_email}}

View File

@ -52,7 +52,7 @@ LOGLEVEL=error
# (returns `noreply%40youremail.host`) # (returns `noreply%40youremail.host`)
# EMAIL_CONFIG=smtp://user:password@youremail.host:25 # EMAIL_CONFIG=smtp://user:password@youremail.host:25
# EMAIL_CONFIG=smtp+ssl://user:password@youremail.host:465 # EMAIL_CONFIG=smtp+ssl://user:password@youremail.host:465
# EMAIL_CONFIG=smtp+tls://user:password@youremail.host:587 # EMAIL_CONFIG=smtp+tls://user:password@youremail.host:{{system_email_smtp_port}}
# Make e-mail verification mandatory before using the service # Make e-mail verification mandatory before using the service
# Doesn't apply to admins. # Doesn't apply to admins.

View File

@ -69,7 +69,7 @@ services:
- "127.0.0.1:{{ http_port }}:80" - "127.0.0.1:{{ http_port }}:80"
- "{{ ip4_address }}:25:25" - "{{ ip4_address }}:25:25"
- "{{ ip4_address }}:465:465" - "{{ ip4_address }}:465:465"
- "{{ ip4_address }}:{{system_email_port}}:{{system_email_port}}" - "{{ ip4_address }}:{{system_email_smtp_port}}:{{system_email_smtp_port}}"
- "{{ ip4_address }}:110:110" - "{{ ip4_address }}:110:110"
- "{{ ip4_address }}:995:995" - "{{ ip4_address }}:995:995"
- "{{ ip4_address }}:143:143" - "{{ ip4_address }}:143:143"

View File

@ -14,7 +14,7 @@ REDIS_HOST=redis
REDIS_PORT=6379 REDIS_PORT=6379
REDIS_PASSWORD= REDIS_PASSWORD=
SMTP_SERVER={{system_email_host}} SMTP_SERVER={{system_email_host}}
SMTP_PORT={{system_email_port}} SMTP_PORT={{system_email_smtp_port}}
SMTP_LOGIN={{system_email_username}} SMTP_LOGIN={{system_email_username}}
SMTP_PASSWORD={{system_email_password}} SMTP_PASSWORD={{system_email_password}}
SMTP_AUTH_METHOD=plain SMTP_AUTH_METHOD=plain

View File

@ -28,4 +28,19 @@ web_client_location: "https://{{element_domain}}"
public_baseurl: "https://{{synapse_domain}}" public_baseurl: "https://{{synapse_domain}}"
trusted_key_servers: trusted_key_servers:
- server_name: "matrix.org" - server_name: "matrix.org"
admin_contact: 'mailto:{{administrator_email}}' admin_contact: 'mailto:{{administrator_email}}'
email:
smtp_host: "{{system_email_host}}"
smtp_port: "{{system_email_smtp_port}}"
smtp_user: "{{system_email_username}}"
smtp_pass: "{{system_email_password}}"
#force_tls: true
#require_transport_security: true
enable_tls: "{{ system_email_tls | upper }}"
notif_from: "Your Friendly %(app)s homeserver <{{system_email}}>"
app_name: "Matrix on {{top_domain}}"
enable_notifs: true
notif_for_new_users: false
client_base_url: "{{domain_matrix_synapse}}"
validation_token_lifetime: 15m

View File

@ -17,8 +17,8 @@ PEERTUBE_SECRET={{peertube_secret}}
PEERTUBE_SMTP_USERNAME={{system_email_username}} PEERTUBE_SMTP_USERNAME={{system_email_username}}
PEERTUBE_SMTP_PASSWORD={{system_email_password}} PEERTUBE_SMTP_PASSWORD={{system_email_password}}
PEERTUBE_SMTP_HOSTNAME={{system_email_host}} PEERTUBE_SMTP_HOSTNAME={{system_email_host}}
PEERTUBE_SMTP_PORT={{system_email_port}} PEERTUBE_SMTP_PORT={{system_email_smtp_port}}
PEERTUBE_SMTP_FROM={{system_email}} PEERTUBE_SMTP_FROM={{system_email}}
PEERTUBE_SMTP_TLS=false PEERTUBE_SMTP_TLS={{ system_email_tls | upper }}}
PEERTUBE_SMTP_DISABLE_STARTTLS=false PEERTUBE_SMTP_DISABLE_STARTTLS={{ 'false' if system_email_start_tls else 'true' }}
PEERTUBE_ADMIN_EMAIL={{system_email}} PEERTUBE_ADMIN_EMAIL={{system_email}}

View File

@ -47,7 +47,7 @@ RESTRICTED_INSTANCE=false
## Mail ## Mail
MAIL_DRIVER=log MAIL_DRIVER=log
MAIL_HOST={{system_email_host}} MAIL_HOST={{system_email_host}}
MAIL_PORT={{system_email_port}} MAIL_PORT={{system_email_smtp_port}}
MAIL_FROM_ADDRESS="{{system_email_username}}" MAIL_FROM_ADDRESS="{{system_email_username}}"
MAIL_FROM_NAME="Pixelfed" MAIL_FROM_NAME="Pixelfed"
MAIL_USERNAME={{system_email_username}} MAIL_USERNAME={{system_email_username}}

View File

@ -1,13 +1,17 @@
# Set default values for all following accounts. # Set default values for all following accounts.
defaults defaults
auth on auth on
logfile ~/.msmtp.log
{% if system_email_tls %}
tls on tls on
tls_trust_file /etc/ssl/certs/ca-certificates.crt tls_trust_file /etc/ssl/certs/ca-certificates.crt
logfile ~/.msmtp.log {% else %}
tls off
{% endif %}
account system_email account system_email
host {{system_email_host}} host {{system_email_host}}
port {{system_email_port}} port {{system_email_smtp_port}}
from {{system_email}} from {{system_email}}
user {{system_email_username}} user {{system_email_username}}
password {{system_email_password}} password {{system_email_password}}