Replace `synapse_admin_container_uid` and `synapse_admin_container_gid`

Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>

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 '' }}"
 

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"

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 \

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: