mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-11-06 02:37:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor sliding-sync improvements

Browse Source
This commit is contained in:
Slavi Pantaleev 2024-01-05 06:04:44 +02:00
parent 015acb6d08
commit 170f321a01
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
group_vars/matrix_servers
View File

@ -4389,7 +4389,7 @@ matrix_sliding_sync_container_image_self_build: "{{ matrix_architecture not in [
matrix_sliding_sync_container_additional_networks: |
{{
(
([matrix_playbook_reverse_proxyable_services_additional_network] if matrix_playbook_reverse_proxyable_services_additional_network else [])
([matrix_playbook_reverse_proxyable_services_additional_network] if matrix_sliding_sync_container_labels_traefik_enabled and matrix_playbook_reverse_proxyable_services_additional_network else [])
+
([] if matrix_homeserver_container_network in ['', matrix_sliding_sync_container_network] else [matrix_homeserver_container_network])
+
@ -4402,13 +4402,11 @@ matrix_sliding_sync_container_labels_traefik_docker_network: "{{ matrix_playbook
matrix_sliding_sync_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}"
matrix_sliding_sync_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}"
matrix_sliding_sync_systemd_required_services_list: |
matrix_sliding_sync_systemd_required_services_list_auto: |
{{
['docker.service']
+
matrix_homeserver_systemd_services_list
+
([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else [])
([devture_postgres_identifier ~ '.service'] if (devture_postgres_enabled and matrix_sliding_sync_database_hostname == devture_postgres_connection_hostname) else [])
}}
matrix_sliding_sync_environment_variable_syncv3_secret: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'ss.secret', rounds=655555) | to_uuid }}"

5
roles/custom/matrix-sliding-sync/defaults/main.yml
View File

@ -72,7 +72,10 @@ matrix_sliding_sync_container_labels_additional_labels: ''
matrix_sliding_sync_container_extra_arguments: []
# List of systemd services that matrix-sliding-sync-proxy.service depends on
matrix_sliding_sync_systemd_required_services_list: ["docker.service"]
matrix_sliding_sync_systemd_required_services_list: "{{ matrix_sliding_sync_systemd_required_services_list_default + matrix_sliding_sync_systemd_required_services_list_auto + matrix_sliding_sync_systemd_required_services_list_custom }}"
matrix_sliding_sync_systemd_required_services_list_default: ["docker.service"]
matrix_sliding_sync_systemd_required_services_list_auto: []
matrix_sliding_sync_systemd_required_services_list_custom: []
# List of systemd services that matrix-sliding-sync-proxy.service wants
matrix_sliding_sync_systemd_wanted_services_list: []