From 43ddd215f71fe5c8fb6be2b516ce0c0247435538 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Mon, 16 Feb 2026 04:25:08 +0900 Subject: [PATCH] Replace `synapse_admin_container_uid` and `synapse_admin_container_gid` Signed-off-by: Suguru Hirahara --- group_vars/matrix_servers | 4 ++-- roles/custom/matrix-synapse-admin/defaults/main.yml | 4 ++-- .../templates/systemd/matrix-synapse-admin.service.j2 | 2 +- .../matrix_playbook_migration/tasks/validate_config.yml | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 82ee42c60..9e7a21d29 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -5002,8 +5002,8 @@ synapse_admin_identifier: matrix-synapse-admin synapse_admin_container_image_registry_prefix: "{{ 'localhost/' if synapse_admin_container_image_self_build else synapse_admin_container_image_registry_prefix_upstream }}" synapse_admin_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else synapse_admin_container_image_registry_prefix_upstream_default }}" -synapse_admin_container_uid: "{{ matrix_user_uid }}" -synapse_admin_container_gid: "{{ matrix_user_gid }}" +synapse_admin_uid: "{{ matrix_user_uid }}" +synapse_admin_gid: "{{ matrix_user_gid }}" synapse_admin_container_http_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ '8766') if matrix_playbook_service_host_bind_interface_prefix else '' }}" diff --git a/roles/custom/matrix-synapse-admin/defaults/main.yml b/roles/custom/matrix-synapse-admin/defaults/main.yml index 5847ee044..3edb3c131 100644 --- a/roles/custom/matrix-synapse-admin/defaults/main.yml +++ b/roles/custom/matrix-synapse-admin/defaults/main.yml @@ -20,8 +20,8 @@ synapse_admin_enabled: true synapse_admin_config_path: "{{ synapse_admin_base_path }}/config" synapse_admin_docker_src_files_path: "{{ synapse_admin_base_path }}/docker-src" -synapse_admin_container_uid: '' -synapse_admin_container_gid: '' +synapse_admin_uid: '' +synapse_admin_gid: '' synapse_admin_container_image_self_build: false synapse_admin_container_image_self_build_repo: "https://github.com/etkecc/synapse-admin.git" diff --git a/roles/custom/matrix-synapse-admin/templates/systemd/matrix-synapse-admin.service.j2 b/roles/custom/matrix-synapse-admin/templates/systemd/matrix-synapse-admin.service.j2 index b5413ce1b..086631f3f 100644 --- a/roles/custom/matrix-synapse-admin/templates/systemd/matrix-synapse-admin.service.j2 +++ b/roles/custom/matrix-synapse-admin/templates/systemd/matrix-synapse-admin.service.j2 @@ -22,7 +22,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --log-driver=none \ --cap-drop=ALL \ --read-only \ - --user={{ synapse_admin_container_uid }}:{{ synapse_admin_container_gid }} \ + --user={{ synapse_admin_uid }}:{{ synapse_admin_gid }} \ --network={{ synapse_admin_container_network }} \ {% if synapse_admin_container_http_host_bind_port %} -p {{ synapse_admin_container_http_host_bind_port }}:8080 \ diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml index 4168aa52c..089874cd0 100644 --- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml +++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml @@ -99,6 +99,8 @@ - {'old': 'synapse_admin_docker_image_registry_prefix', 'new': 'synapse_admin_container_image_registry_prefix'} - {'old': 'synapse_admin_docker_image_registry_prefix_upstream', 'new': 'synapse_admin_container_image_registry_prefix_upstream'} - {'old': 'synapse_admin_docker_image_registry_prefix_upstream_default', 'new': 'synapse_admin_container_image_registry_prefix_upstream_default'} + - {'old': 'synapse_admin_container_uid', 'new': 'synapse_admin_uid'} + - {'old': 'synapse_admin_container_gid', 'new': 'synapse_admin_gid'} - name: (Deprecation) Catch and report matrix_postgres variables ansible.builtin.fail: