In between commit, updated matrix and optimized mailu

This commit is contained in:
2025-08-20 17:48:59 +02:00
parent 384beae7c1
commit 7a6e273ea4
14 changed files with 77 additions and 14 deletions

View File

@@ -5,9 +5,10 @@
"server_name": "{{ MATRIX_SYNAPSE_DOMAIN }}"
},
"m.identity_server": {
"base_url": "{{ WEB_PROTOCOL }}://{{ PRIMARY_DOMAIN }}"
"base_url": "{{ MATRIX_BASE_URL }}"
}
},
"logout_redirect_url": "{{ OIDC.CLIENT.LOGOUT_URL if MATRIX_OIDC_ENABLED else MATRIX_BASE_URL }}",
"brand": "Element",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",

View File

@@ -3,8 +3,8 @@ server {
{% include 'roles/srv-letsencrypt/templates/ssl_header.j2' %}
# For the federation port
listen {{ FEDERATION_PORT }} ssl default_server;
listen [::]:{{ FEDERATION_PORT }} ssl default_server;
listen {{ MATRIX_FEDERATION_PORT }} ssl default_server;
listen [::]:{{ MATRIX_FEDERATION_PORT }} ssl default_server;
{% include 'roles/sys-srv-web-inj-compose/templates/server.conf.j2'%}

View File

@@ -17,7 +17,9 @@ MATRIX_WELL_KNOWN_FILE: "{{ MATRIX_WELL_KNOWN_DIRECTORY }}server"
MATRIX_PROJECT: "{{ application_id | get_entity_name }}"
MATRIX_REGISTRATION_FILE_FOLDER: "/data/"
MATRIX_REGISTRATION_SHARED_SECRET: "{{ applications | get_app_conf(application_id, 'credentials.registration_shared_secret') }}"
FEDERATION_PORT: "{{ ports.public.federation['web-app-matrix_synapse'] }}"
MATRIX_FEDERATION_PORT: "{{ ports.public.federation['web-app-matrix_synapse'] }}"
MATRIX_OIDC_ENABLED: "{{ applications | get_app_conf(application_id, 'features.oidc', False) }}"
MATRIX_BASE_URL: "{{ WEB_PROTOCOL }}://{{ PRIMARY_DOMAIN }}"
## Synapse
MATRIX_SYNAPSE_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.synapse.version') }}"
@@ -38,4 +40,4 @@ MATRIX_ELEMENT_IMAGE: "{{ applications | get_app_conf(applicatio
MATRIX_ELEMENT_NAME: "{{ applications | get_app_conf(application_id, 'docker.services.element.name') }}"
MATRIX_ELEMENT_DOMAIN: "{{ domains[application_id].element }}"
MATRIX_ELEMENT_PORT: "{{ ports.localhost.http['web-app-matrix_element'] }}"
MATRIX_ELEMENT_CONFIG_PATH_HOST: "{{ docker_compose.directories.config }}element-config.json"
MATRIX_ELEMENT_CONFIG_PATH_HOST: "{{ docker_compose.directories.config }}element-config.json"