mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-04-20 12:18:00 +03:00
Compare commits
7 Commits
a602035383
...
2237b53979
| Author | SHA1 | Date | |
|---|---|---|---|
| 2237b53979 | |||
| 0320e671e3 | |||
| 0c4bce582f | |||
| 4e3658bb98 | |||
| 94beb79279 | |||
| ac559889f9 | |||
| 12d8015bc4 |
@@ -3981,6 +3981,10 @@ postgres_base_path: "{{ matrix_base_data_path }}/postgres"
|
|||||||
postgres_uid: "{{ matrix_user_uid }}"
|
postgres_uid: "{{ matrix_user_uid }}"
|
||||||
postgres_gid: "{{ matrix_user_gid }}"
|
postgres_gid: "{{ matrix_user_gid }}"
|
||||||
|
|
||||||
|
# unix socket connection, disabled by default temporarily until properly tested
|
||||||
|
postgres_container_unix_socket_enabled: false
|
||||||
|
postgres_cli_use_unix_socket_enabled: false
|
||||||
|
|
||||||
postgres_allowed_versions_auto: "{{ backup_borg_supported_postgres_versions | map('int') if backup_borg_enabled | default(false) and backup_borg_postgresql_enabled | default(false) else [] }}"
|
postgres_allowed_versions_auto: "{{ backup_borg_supported_postgres_versions | map('int') if backup_borg_enabled | default(false) and backup_borg_postgresql_enabled | default(false) else [] }}"
|
||||||
|
|
||||||
postgres_connection_username: matrix
|
postgres_connection_username: matrix
|
||||||
@@ -4793,6 +4797,13 @@ matrix_synapse_workers_container_host_bind_address: "{{ matrix_playbook_service_
|
|||||||
matrix_synapse_database_host: "{{ postgres_connection_hostname if postgres_enabled else '' }}"
|
matrix_synapse_database_host: "{{ postgres_connection_hostname if postgres_enabled else '' }}"
|
||||||
matrix_synapse_database_password: "{{ (matrix_homeserver_generic_secret_key + ':synapse.db') | hash('sha512') | to_uuid }}"
|
matrix_synapse_database_password: "{{ (matrix_homeserver_generic_secret_key + ':synapse.db') | hash('sha512') | to_uuid }}"
|
||||||
|
|
||||||
|
# unix socket connection, disabled by default temporarily until properly tested
|
||||||
|
matrix_synapse_database_socket_enabled: false
|
||||||
|
# path to the Postgres socket's parent dir inside the Synapse container
|
||||||
|
matrix_synapse_database_socket_path: "{{ '/tmp/postgres' if postgres_enabled else '' }}"
|
||||||
|
# path to the Postgres socket on the host, using Postgres
|
||||||
|
matrix_synapse_database_socket_path_host: "{{ postgres_run_path if postgres_enabled else '' }}"
|
||||||
|
|
||||||
matrix_synapse_macaroon_secret_key: "{{ (matrix_homeserver_generic_secret_key + ':synapse.mac') | hash('sha512') | to_uuid }}"
|
matrix_synapse_macaroon_secret_key: "{{ (matrix_homeserver_generic_secret_key + ':synapse.mac') | hash('sha512') | to_uuid }}"
|
||||||
|
|
||||||
# We do not enable TLS in Synapse by default, since it's handled by Traefik.
|
# We do not enable TLS in Synapse by default, since it's handled by Traefik.
|
||||||
@@ -5873,7 +5884,10 @@ matrix_user_verification_service_container_http_host_bind_port: "{{ '' if (jits
|
|||||||
# URL exposed in the docker network
|
# URL exposed in the docker network
|
||||||
matrix_user_verification_service_container_url: "http://{{ matrix_user_verification_service_container_name }}:3000"
|
matrix_user_verification_service_container_url: "http://{{ matrix_user_verification_service_container_name }}:3000"
|
||||||
|
|
||||||
matrix_user_verification_service_uvs_homeserver_url: "{{ matrix_addons_homeserver_client_api_url }}"
|
# Using `matrix_addons_homeserver_client_api_url` would not work here,
|
||||||
|
# because `matrix-traefik:8008` (matrix-internal-client-api) does not expose any `/_synapse` paths.
|
||||||
|
# UVS accesses `/_synapse/admin/v1/rooms` API to check room membership.
|
||||||
|
matrix_user_verification_service_uvs_homeserver_url: "{{ matrix_homeserver_container_url }}"
|
||||||
|
|
||||||
# We connect via the container network (private IPs), so we need to disable IP checks
|
# We connect via the container network (private IPs), so we need to disable IP checks
|
||||||
matrix_user_verification_service_uvs_disable_ip_blacklist: "{{ matrix_synapse_enabled }}"
|
matrix_user_verification_service_uvs_disable_ip_blacklist: "{{ matrix_synapse_enabled }}"
|
||||||
|
|||||||
+3
-3
@@ -57,7 +57,7 @@
|
|||||||
version: dd6e15246b7a9a2d921e0b3f9cd8a4a917a1bb2f
|
version: dd6e15246b7a9a2d921e0b3f9cd8a4a917a1bb2f
|
||||||
name: playbook_state_preserver
|
name: playbook_state_preserver
|
||||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-postgres.git
|
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-postgres.git
|
||||||
version: v18.3-0
|
version: v18.3-1
|
||||||
name: postgres
|
name: postgres
|
||||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-postgres-backup.git
|
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-postgres-backup.git
|
||||||
version: v18-1
|
version: v18-1
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
version: v0.19.1-0
|
version: v0.19.1-0
|
||||||
name: prometheus_postgres_exporter
|
name: prometheus_postgres_exporter
|
||||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-sable.git
|
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-sable.git
|
||||||
version: v1.6.0-0
|
version: v1.6.0-1
|
||||||
name: sable
|
name: sable
|
||||||
- src: git+https://github.com/devture/com.devture.ansible.role.systemd_docker_base.git
|
- src: git+https://github.com/devture/com.devture.ansible.role.systemd_docker_base.git
|
||||||
version: v1.5.0-0
|
version: v1.5.0-0
|
||||||
@@ -87,7 +87,7 @@
|
|||||||
version: v1.1.0-1
|
version: v1.1.0-1
|
||||||
name: timesync
|
name: timesync
|
||||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-traefik.git
|
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-traefik.git
|
||||||
version: v3.6.10-0
|
version: v3.6.10-1
|
||||||
name: traefik
|
name: traefik
|
||||||
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-traefik-certs-dumper.git
|
- src: git+https://github.com/mother-of-all-self-hosting/ansible-role-traefik-certs-dumper.git
|
||||||
version: v2.10.0-5
|
version: v2.10.0-5
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ matrix_client_element_container_image_self_build_repo: "https://github.com/eleme
|
|||||||
matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_facts['memtotal_mb'] < 4096 }}"
|
matrix_client_element_container_image_self_build_low_memory_system_patch_enabled: "{{ ansible_facts['memtotal_mb'] < 4096 }}"
|
||||||
|
|
||||||
# renovate: datasource=docker depName=ghcr.io/element-hq/element-web
|
# renovate: datasource=docker depName=ghcr.io/element-hq/element-web
|
||||||
matrix_client_element_version: v1.12.11
|
matrix_client_element_version: v1.12.12
|
||||||
|
|
||||||
matrix_client_element_container_image: "{{ matrix_client_element_container_image_registry_prefix }}element-hq/element-web:{{ matrix_client_element_version }}"
|
matrix_client_element_container_image: "{{ matrix_client_element_container_image_registry_prefix }}element-hq/element-web:{{ matrix_client_element_version }}"
|
||||||
matrix_client_element_container_image_registry_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_client_element_container_image_registry_prefix_upstream }}"
|
matrix_client_element_container_image_registry_prefix: "{{ 'localhost/' if matrix_client_element_container_image_self_build else matrix_client_element_container_image_registry_prefix_upstream }}"
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ matrix_synapse_enabled: true
|
|||||||
matrix_synapse_github_org_and_repo: element-hq/synapse
|
matrix_synapse_github_org_and_repo: element-hq/synapse
|
||||||
|
|
||||||
# renovate: datasource=docker depName=ghcr.io/element-hq/synapse
|
# renovate: datasource=docker depName=ghcr.io/element-hq/synapse
|
||||||
matrix_synapse_version: v1.148.0
|
matrix_synapse_version: v1.149.0
|
||||||
|
|
||||||
matrix_synapse_username: ''
|
matrix_synapse_username: ''
|
||||||
matrix_synapse_uid: ''
|
matrix_synapse_uid: ''
|
||||||
@@ -1284,6 +1284,13 @@ matrix_synapse_database_cp_max: 10
|
|||||||
matrix_synapse_database_user: "synapse"
|
matrix_synapse_database_user: "synapse"
|
||||||
matrix_synapse_database_password: ""
|
matrix_synapse_database_password: ""
|
||||||
matrix_synapse_database_database: "synapse"
|
matrix_synapse_database_database: "synapse"
|
||||||
|
# Connection option 2: Unix socket (takes precedence over TCP if enabled)
|
||||||
|
# disabled by default
|
||||||
|
matrix_synapse_database_socket_enabled: false
|
||||||
|
# the path to the postgres socket's parent dir inside the container (not the socket file itself).
|
||||||
|
matrix_synapse_database_socket_path: "/tmp/postgres"
|
||||||
|
# the path to the postgres socket on the host, e.g., "/matrix/postgres/run" (parent dir, not the socket file itself).
|
||||||
|
matrix_synapse_database_socket_path_host: ""
|
||||||
|
|
||||||
matrix_synapse_turn_uris: []
|
matrix_synapse_turn_uris: []
|
||||||
matrix_synapse_turn_shared_secret: ""
|
matrix_synapse_turn_shared_secret: ""
|
||||||
@@ -1747,7 +1754,7 @@ matrix_synapse_register_user_script_matrix_authentication_service_path: ""
|
|||||||
matrix_synapse_reverse_proxy_companion_enabled: "{{ matrix_synapse_enabled and matrix_synapse_workers_enabled }}"
|
matrix_synapse_reverse_proxy_companion_enabled: "{{ matrix_synapse_enabled and matrix_synapse_workers_enabled }}"
|
||||||
|
|
||||||
# renovate: datasource=docker depName=nginx
|
# renovate: datasource=docker depName=nginx
|
||||||
matrix_synapse_reverse_proxy_companion_version: 1.29.5-alpine
|
matrix_synapse_reverse_proxy_companion_version: 1.29.6-alpine
|
||||||
|
|
||||||
matrix_synapse_reverse_proxy_companion_base_path: "{{ matrix_synapse_base_path }}/reverse-proxy-companion"
|
matrix_synapse_reverse_proxy_companion_base_path: "{{ matrix_synapse_base_path }}/reverse-proxy-companion"
|
||||||
matrix_synapse_reverse_proxy_companion_confd_path: "{{ matrix_synapse_reverse_proxy_companion_base_path }}/conf.d"
|
matrix_synapse_reverse_proxy_companion_confd_path: "{{ matrix_synapse_reverse_proxy_companion_base_path }}/conf.d"
|
||||||
|
|||||||
@@ -864,7 +864,7 @@ database:
|
|||||||
user: {{ matrix_synapse_database_user | string|to_json }}
|
user: {{ matrix_synapse_database_user | string|to_json }}
|
||||||
password: {{ matrix_synapse_database_password | string|to_json }}
|
password: {{ matrix_synapse_database_password | string|to_json }}
|
||||||
database: "{{ matrix_synapse_database_database }}"
|
database: "{{ matrix_synapse_database_database }}"
|
||||||
host: "{{ matrix_synapse_database_host }}"
|
host: "{{ matrix_synapse_database_socket_path if matrix_synapse_database_socket_enabled else matrix_synapse_database_host }}"
|
||||||
port: {{ matrix_synapse_database_port }}
|
port: {{ matrix_synapse_database_port }}
|
||||||
cp_min: {{ matrix_synapse_database_cp_min | to_json }}
|
cp_min: {{ matrix_synapse_database_cp_min | to_json }}
|
||||||
cp_max: {{ matrix_synapse_database_cp_max | to_json }}
|
cp_max: {{ matrix_synapse_database_cp_max | to_json }}
|
||||||
|
|||||||
@@ -70,6 +70,9 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
|||||||
{% if matrix_synapse_redis_path_enabled %}
|
{% if matrix_synapse_redis_path_enabled %}
|
||||||
--mount type=bind,src={{ matrix_synapse_redis_path_host }},dst={{ matrix_synapse_redis_path }} \
|
--mount type=bind,src={{ matrix_synapse_redis_path_host }},dst={{ matrix_synapse_redis_path }} \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if matrix_synapse_database_socket_enabled %}
|
||||||
|
--mount type=bind,src={{ matrix_synapse_database_socket_path_host }},dst={{ matrix_synapse_database_socket_path }} \
|
||||||
|
{% endif %}
|
||||||
--label-file={{ matrix_synapse_base_path }}/{{ matrix_synapse_worker_labels_file_name }} \
|
--label-file={{ matrix_synapse_base_path }}/{{ matrix_synapse_worker_labels_file_name }} \
|
||||||
{% for arg in matrix_synapse_container_arguments %}
|
{% for arg in matrix_synapse_container_arguments %}
|
||||||
{{ arg }} \
|
{{ arg }} \
|
||||||
|
|||||||
@@ -54,6 +54,9 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
|||||||
{% if matrix_synapse_redis_path_enabled %}
|
{% if matrix_synapse_redis_path_enabled %}
|
||||||
--mount type=bind,src={{ matrix_synapse_redis_path_host }},dst={{ matrix_synapse_redis_path }} \
|
--mount type=bind,src={{ matrix_synapse_redis_path_host }},dst={{ matrix_synapse_redis_path }} \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if matrix_synapse_database_socket_enabled %}
|
||||||
|
--mount type=bind,src={{ matrix_synapse_database_socket_path_host }},dst={{ matrix_synapse_database_socket_path }} \
|
||||||
|
{% endif %}
|
||||||
--label-file={{ matrix_synapse_base_path }}/labels \
|
--label-file={{ matrix_synapse_base_path }}/labels \
|
||||||
{% for volume in matrix_synapse_container_additional_volumes %}
|
{% for volume in matrix_synapse_container_additional_volumes %}
|
||||||
--mount type={{ volume.type | default('bind' if '/' in volume.src else 'volume') }},src={{ volume.src }},dst={{ volume.dst }}{{ (',' + volume.options) if volume.options else '' }} \
|
--mount type={{ volume.type | default('bind' if '/' in volume.src else 'volume') }},src={{ volume.src }},dst={{ volume.dst }}{{ (',' + volume.options) if volume.options else '' }} \
|
||||||
|
|||||||
Reference in New Issue
Block a user