From 9fc5cdab33c042d8d1dbb97cefcd96237d17b6c1 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 29 Apr 2025 10:34:10 +0300 Subject: [PATCH] Rename variable (`matrix_user_username` -> `matrix_user_name`) --- docs/configuring-playbook-bridge-hookshot.md | 2 +- docs/configuring-playbook-sygnal.md | 2 +- group_vars/matrix_servers | 10 +++++----- .../matrix-alertmanager-receiver/tasks/install.yml | 8 ++++---- .../tasks/install.yml | 4 ++-- .../tasks/setup_install.yml | 10 +++++----- .../tasks/install.yml | 8 ++++---- .../tasks/syn2mas.yml | 2 +- .../tasks/util/prepare_key.yml | 2 +- roles/custom/matrix-base/defaults/main.yml | 4 ++-- .../custom/matrix-base/tasks/setup_matrix_base.yml | 2 +- .../custom/matrix-base/tasks/setup_matrix_user.yml | 2 +- roles/custom/matrix-base/tasks/validate_config.yml | 1 + roles/custom/matrix-bot-baibot/tasks/install.yml | 8 ++++---- .../matrix-bot-buscarron/tasks/setup_install.yml | 6 +++--- roles/custom/matrix-bot-chatgpt/tasks/install.yml | 6 +++--- .../matrix-bot-draupnir/tasks/setup_install.yml | 8 ++++---- roles/custom/matrix-bot-go-neb/tasks/install.yml | 6 +++--- .../matrix-bot-honoroit/tasks/setup_install.yml | 6 +++--- .../tasks/clean_cache.yml | 2 +- .../tasks/setup_install.yml | 6 +++--- .../tasks/setup_install.yml | 6 +++--- .../matrix-bot-maubot/tasks/setup_install.yml | 10 +++++----- .../matrix-bot-mjolnir/tasks/setup_install.yml | 6 +++--- .../tasks/setup_install.yml | 6 +++--- .../tasks/setup_install.yml | 12 ++++++------ .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 14 +++++++------- .../tasks/setup_install.yml | 8 ++++---- .../tasks/setup_install.yml | 8 ++++---- .../tasks/setup_install.yml | 6 +++--- .../matrix-bridge-hookshot/tasks/setup_install.yml | 14 +++++++------- .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 10 +++++----- .../tasks/install.yml | 10 +++++----- .../tasks/install.yml | 10 +++++----- .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 8 ++++---- .../tasks/setup_install.yml | 12 ++++++------ .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 12 ++++++------ .../tasks/setup_install.yml | 8 ++++---- .../tasks/setup_install.yml | 8 ++++---- .../tasks/setup_install.yml | 8 ++++---- .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 8 ++++---- .../tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 6 +++--- .../matrix-bridge-sms/tasks/setup_install.yml | 8 ++++---- .../custom/matrix-bridge-wechat/tasks/install.yml | 12 ++++++------ .../tasks/install.yml | 12 ++++++------ .../matrix-cactus-comments/tasks/setup_install.yml | 8 ++++---- .../matrix-client-cinny/tasks/setup_install.yml | 8 ++++---- .../matrix-client-element/tasks/setup_install.yml | 10 +++++----- .../tasks/setup_install.yml | 6 +++--- .../matrix-client-hydrogen/tasks/setup_install.yml | 8 ++++---- .../tasks/setup_install.yml | 10 +++++----- .../custom/matrix-conduit/tasks/setup_install.yml | 8 ++++---- roles/custom/matrix-conduwuit/tasks/install.yml | 8 ++++---- .../matrix-conduwuit/tasks/setup_install.yml | 8 ++++---- roles/custom/matrix-continuwuity/tasks/install.yml | 8 ++++---- .../tasks/migrate_from_conduwuit.yml | 4 ++-- .../matrix-continuwuity/tasks/setup_install.yml | 8 ++++---- .../custom/matrix-corporal/tasks/setup_install.yml | 8 ++++---- roles/custom/matrix-coturn/tasks/setup_install.yml | 8 ++++---- .../custom/matrix-dendrite/tasks/setup_install.yml | 12 ++++++------ .../matrix-dimension/tasks/setup_install.yml | 8 ++++---- .../matrix-dynamic-dns/tasks/setup_install.yml | 6 +++--- roles/custom/matrix-element-call/tasks/install.yml | 6 +++--- .../tasks/setup_install.yml | 8 ++++---- .../matrix-livekit-jwt-service/tasks/install.yml | 6 +++--- roles/custom/matrix-ma1sd/tasks/setup_install.yml | 12 ++++++------ .../matrix-media-repo/tasks/setup_install.yml | 10 +++++----- roles/custom/matrix-pantalaimon/tasks/install.yml | 6 +++--- .../tasks/setup_install.yml | 6 +++--- roles/custom/matrix-rageshake/tasks/install.yml | 8 ++++---- .../matrix-registration/tasks/setup_install.yml | 8 ++++---- roles/custom/matrix-sliding-sync/tasks/install.yml | 6 +++--- roles/custom/matrix-static-files/tasks/install.yml | 6 +++--- roles/custom/matrix-sygnal/tasks/install.yml | 6 +++--- .../matrix-synapse-admin/tasks/setup_install.yml | 8 ++++---- .../tasks/install.yml | 8 ++++---- .../tasks/setup_install.yml | 4 ++-- .../tasks/setup_install.yml | 6 +++--- .../tasks/setup_install.yml | 6 +++--- 91 files changed, 352 insertions(+), 351 deletions(-) diff --git a/docs/configuring-playbook-bridge-hookshot.md b/docs/configuring-playbook-bridge-hookshot.md index fc637d853..07d2aea4c 100644 --- a/docs/configuring-playbook-bridge-hookshot.md +++ b/docs/configuring-playbook-bridge-hookshot.md @@ -126,7 +126,7 @@ aux_file_definitions: - dest: "{{ matrix_hookshot_base_path }}/{{ matrix_hookshot_github_private_key_file }}" content: "{{ lookup('file', '/path/to/your-github-private-key.pem') }}" mode: '0400' - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" ``` diff --git a/docs/configuring-playbook-sygnal.md b/docs/configuring-playbook-sygnal.md index 2bd800cdd..69c2aee18 100644 --- a/docs/configuring-playbook-sygnal.md +++ b/docs/configuring-playbook-sygnal.md @@ -49,7 +49,7 @@ aux_file_definitions: content here mode: '0600' - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" ``` diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 45d2a81a4..5409e9220 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -73,10 +73,10 @@ matrix_federation_traefik_entrypoint_tls: "{{ traefik_config_entrypoint_web_secu # # ######################################################################## -aux_directory_default_owner: "{{ matrix_user_username }}" +aux_directory_default_owner: "{{ matrix_user_name }}" aux_directory_default_group: "{{ matrix_user_groupname }}" -aux_file_default_owner: "{{ matrix_user_username }}" +aux_file_default_owner: "{{ matrix_user_name }}" aux_file_default_group: "{{ matrix_user_groupname }}" ######################################################################## @@ -3314,7 +3314,7 @@ backup_borg_storage_archive_name_format: matrix-{now:%Y-%m-%d-%H%M%S} backup_borg_base_path: "{{ matrix_base_data_path }}/backup-borg" -backup_borg_username: "{{ matrix_user_username }}" +backup_borg_username: "{{ matrix_user_name }}" backup_borg_uid: "{{ matrix_user_uid }}" backup_borg_gid: "{{ matrix_user_gid }}" @@ -3743,7 +3743,7 @@ jitsi_base_path: "{{ matrix_base_data_path }}/jitsi" jitsi_uid: "{{ matrix_user_uid }}" jitsi_gid: "{{ matrix_user_gid }}" -jitsi_user_username: "{{ matrix_user_username }}" +jitsi_user_username: "{{ matrix_user_name }}" jitsi_web_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else jitsi_web_container_image_registry_prefix_upstream_default }}" @@ -4795,7 +4795,7 @@ matrix_client_fluffychat_self_check_validate_certificates: "{{ matrix_playbook_s matrix_synapse_enabled: "{{ matrix_homeserver_implementation == 'synapse' }}" -matrix_synapse_username: "{{ matrix_user_username }}" +matrix_synapse_username: "{{ matrix_user_name }}" matrix_synapse_uid: "{{ matrix_user_uid }}" matrix_synapse_gid: "{{ matrix_user_gid }}" diff --git a/roles/custom/matrix-alertmanager-receiver/tasks/install.yml b/roles/custom/matrix-alertmanager-receiver/tasks/install.yml index a710fcdf3..c72689afb 100644 --- a/roles/custom/matrix-alertmanager-receiver/tasks/install.yml +++ b/roles/custom/matrix-alertmanager-receiver/tasks/install.yml @@ -10,7 +10,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - path: "{{ matrix_alertmanager_receiver_base_path }}" @@ -26,7 +26,7 @@ content: "{{ matrix_alertmanager_receiver_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_alertmanager_receiver_config_path }}/config.yml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-alertmanager-receiver support files installed @@ -34,7 +34,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_alertmanager_receiver_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels @@ -60,7 +60,7 @@ dest: "{{ matrix_alertmanager_receiver_container_src_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_alertmanager_receiver_git_pull_results - name: Ensure matrix-alertmanager-receiver container image is built diff --git a/roles/custom/matrix-appservice-double-puppet/tasks/install.yml b/roles/custom/matrix-appservice-double-puppet/tasks/install.yml index a0a427aae..d54c1b6a4 100644 --- a/roles/custom/matrix-appservice-double-puppet/tasks/install.yml +++ b/roles/custom/matrix-appservice-double-puppet/tasks/install.yml @@ -9,7 +9,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - path: "{{ matrix_appservice_double_puppet_base_path }}" @@ -23,5 +23,5 @@ content: "{{ matrix_appservice_double_puppet_registration_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_double_puppet_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" diff --git a/roles/custom/matrix-appservice-draupnir-for-all/tasks/setup_install.yml b/roles/custom/matrix-appservice-draupnir-for-all/tasks/setup_install.yml index 12781f5dc..c6fa3fbc8 100644 --- a/roles/custom/matrix-appservice-draupnir-for-all/tasks/setup_install.yml +++ b/roles/custom/matrix-appservice-draupnir-for-all/tasks/setup_install.yml @@ -16,7 +16,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_appservice_draupnir_for_all_base_path }}", when: true} @@ -44,7 +44,7 @@ version: "{{ matrix_appservice_draupnir_for_all_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_appservice_draupnir_for_all_git_pull_results when: "matrix_appservice_draupnir_for_all_container_image_self_build | bool" @@ -64,7 +64,7 @@ content: "{{ matrix_appservice_draupnir_for_all_configuration_appservice | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_draupnir_for_all_config_path }}/production-appservice.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-draupnir-for-all bot config installed @@ -72,7 +72,7 @@ content: "{{ matrix_appservice_draupnir_for_all_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_draupnir_for_all_config_path }}/production-bots.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-draupnir-for-all registration.yaml installed @@ -80,7 +80,7 @@ content: "{{ matrix_appservice_draupnir_for_all_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_draupnir_for_all_config_path }}/draupnir-for-all-registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-draupnir-for-all container network is created diff --git a/roles/custom/matrix-authentication-service/tasks/install.yml b/roles/custom/matrix-authentication-service/tasks/install.yml index 2b04b6708..ad3a56d18 100644 --- a/roles/custom/matrix-authentication-service/tasks/install.yml +++ b/roles/custom/matrix-authentication-service/tasks/install.yml @@ -9,7 +9,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_authentication_service_base_path }}", when: true} @@ -38,7 +38,7 @@ content: "{{ matrix_authentication_service_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_authentication_service_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Matrix Authentication Service support files created @@ -46,7 +46,7 @@ src: "{{ item.src }}" dest: "{{ item.dest }}" mode: "{{ item.mode }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - src: "{{ role_path }}/templates/env.j2" @@ -83,7 +83,7 @@ dest: "{{ matrix_authentication_service_container_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" - name: Ensure Matrix Authentication Service container image is built ansible.builtin.command: diff --git a/roles/custom/matrix-authentication-service/tasks/syn2mas.yml b/roles/custom/matrix-authentication-service/tasks/syn2mas.yml index fd30158a4..0a09d5351 100644 --- a/roles/custom/matrix-authentication-service/tasks/syn2mas.yml +++ b/roles/custom/matrix-authentication-service/tasks/syn2mas.yml @@ -54,7 +54,7 @@ dest: "{{ matrix_authentication_service_container_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_authentication_service_git_pull_results - name: Ensure Matrix Authentication Service syn2mas container image is built diff --git a/roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml b/roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml index 1c1877ccd..bd487b201 100644 --- a/roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml +++ b/roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml @@ -13,4 +13,4 @@ cmd: "{{ private_key_definition.generation_command | replace('__KEY_FILE_PATH__', matrix_authentication_service_private_key_file_path) }}" creates: "{{ matrix_authentication_service_private_key_file_path }}" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml index 589a3464d..5571a3b06 100644 --- a/roles/custom/matrix-base/defaults/main.yml +++ b/roles/custom/matrix-base/defaults/main.yml @@ -175,12 +175,12 @@ matrix_debian_arch: "{{ 'armhf' if matrix_architecture == 'arm32' else matrix_ar # Example value: "registry.example.com/" (note the trailing `/`). matrix_container_global_registry_prefix_override: "" -matrix_user_username: "matrix" +matrix_user_name: "matrix" matrix_user_system: true matrix_user_groupname: "matrix" matrix_group_system: true -# By default, the playbook creates the user (`matrix_user_username`) +# By default, the playbook creates the user (`matrix_user_name`) # and group (`matrix_user_groupname`) with a random ID. # To use a specific user/group ID, override these variables. matrix_user_uid: ~ diff --git a/roles/custom/matrix-base/tasks/setup_matrix_base.yml b/roles/custom/matrix-base/tasks/setup_matrix_base.yml index 337017a46..0ab3f8602 100644 --- a/roles/custom/matrix-base/tasks/setup_matrix_base.yml +++ b/roles/custom/matrix-base/tasks/setup_matrix_base.yml @@ -17,7 +17,7 @@ path: "{{ item }}" state: directory mode: "{{ matrix_base_data_path_mode }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - "{{ matrix_base_data_path }}" diff --git a/roles/custom/matrix-base/tasks/setup_matrix_user.yml b/roles/custom/matrix-base/tasks/setup_matrix_user.yml index f45936d14..0d92bd31d 100644 --- a/roles/custom/matrix-base/tasks/setup_matrix_user.yml +++ b/roles/custom/matrix-base/tasks/setup_matrix_user.yml @@ -15,7 +15,7 @@ - name: Ensure Matrix user is created ansible.builtin.user: - name: "{{ matrix_user_username }}" + name: "{{ matrix_user_name }}" uid: "{{ omit if matrix_user_uid is none else matrix_user_uid }}" state: present group: "{{ matrix_user_groupname }}" diff --git a/roles/custom/matrix-base/tasks/validate_config.yml b/roles/custom/matrix-base/tasks/validate_config.yml index 78202331a..8a64d2973 100644 --- a/roles/custom/matrix-base/tasks/validate_config.yml +++ b/roles/custom/matrix-base/tasks/validate_config.yml @@ -32,6 +32,7 @@ - {'old': 'matrix_client_element_e2ee_secure_backup_required', 'new': 'matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_required'} - {'old': 'matrix_client_element_e2ee_secure_backup_setup_methods', 'new': 'matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_setup_methods'} - {'old': 'matrix_container_global_registry_prefix', 'new': ''} + - {'old': 'matrix_user_username', 'new': 'matrix_user_name'} # We have a dedicated check for this variable, because we'd like to have a custom (friendlier) message. - name: Fail if matrix_homeserver_generic_secret_key is undefined diff --git a/roles/custom/matrix-bot-baibot/tasks/install.yml b/roles/custom/matrix-bot-baibot/tasks/install.yml index c2d781e59..d8bb15314 100644 --- a/roles/custom/matrix-bot-baibot/tasks/install.yml +++ b/roles/custom/matrix-bot-baibot/tasks/install.yml @@ -10,7 +10,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_bot_baibot_base_path }}", when: true} @@ -24,14 +24,14 @@ content: "{{ matrix_bot_baibot_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_bot_baibot_config_path }}/config.yml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure baibot environment variables file created ansible.builtin.template: src: "{{ role_path }}/templates/env.j2" dest: "{{ matrix_bot_baibot_config_path }}/env" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 @@ -56,7 +56,7 @@ dest: "{{ matrix_bot_baibot_container_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_bot_baibot_git_pull_results - name: Ensure baibot container image is built diff --git a/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml b/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml index 35d583f8c..8dc7715e8 100644 --- a/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml @@ -39,7 +39,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_bot_buscarron_config_path }}", when: true} @@ -52,7 +52,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_bot_buscarron_config_path }}/{{ item }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 with_items: @@ -78,7 +78,7 @@ dest: "{{ matrix_bot_buscarron_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_bot_buscarron_git_pull_results when: "matrix_bot_buscarron_container_image_self_build | bool" diff --git a/roles/custom/matrix-bot-chatgpt/tasks/install.yml b/roles/custom/matrix-bot-chatgpt/tasks/install.yml index 1f2beae64..c25999ab9 100644 --- a/roles/custom/matrix-bot-chatgpt/tasks/install.yml +++ b/roles/custom/matrix-bot-chatgpt/tasks/install.yml @@ -10,7 +10,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_bot_chatgpt_config_path }}", when: true} @@ -22,7 +22,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/env.j2" dest: "{{ matrix_bot_chatgpt_config_path }}/env" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 @@ -47,7 +47,7 @@ dest: "{{ matrix_bot_chatgpt_container_src_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_bot_chatgpt_git_pull_results - name: Ensure chatgpt container image is built diff --git a/roles/custom/matrix-bot-draupnir/tasks/setup_install.yml b/roles/custom/matrix-bot-draupnir/tasks/setup_install.yml index 042fcbb9e..cb3a0e366 100644 --- a/roles/custom/matrix-bot-draupnir/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-draupnir/tasks/setup_install.yml @@ -16,7 +16,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_bot_draupnir_base_path }}", when: true} @@ -29,7 +29,7 @@ ansible.builtin.template: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0644 with_items: @@ -55,7 +55,7 @@ version: "{{ matrix_bot_draupnir_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_bot_draupnir_git_pull_results when: "matrix_bot_draupnir_container_image_self_build | bool" @@ -75,7 +75,7 @@ content: "{{ matrix_bot_draupnir_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_bot_draupnir_config_path }}/production.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-bot-draupnir container network is created diff --git a/roles/custom/matrix-bot-go-neb/tasks/install.yml b/roles/custom/matrix-bot-go-neb/tasks/install.yml index d590bc999..5f15dc913 100644 --- a/roles/custom/matrix-bot-go-neb/tasks/install.yml +++ b/roles/custom/matrix-bot-go-neb/tasks/install.yml @@ -15,7 +15,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_bot_go_neb_config_path }}", when: true} @@ -28,7 +28,7 @@ content: "{{ matrix_bot_go_neb_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_bot_go_neb_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure go-neb support files installed @@ -36,7 +36,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_bot_go_neb_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - env diff --git a/roles/custom/matrix-bot-honoroit/tasks/setup_install.yml b/roles/custom/matrix-bot-honoroit/tasks/setup_install.yml index 18730e27c..be939b620 100644 --- a/roles/custom/matrix-bot-honoroit/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-honoroit/tasks/setup_install.yml @@ -41,7 +41,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_bot_honoroit_config_path }}", when: true} @@ -54,7 +54,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_bot_honoroit_config_path }}/{{ item }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 with_items: @@ -80,7 +80,7 @@ dest: "{{ matrix_bot_honoroit_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_bot_honoroit_git_pull_results when: "matrix_bot_honoroit_container_image_self_build | bool" diff --git a/roles/custom/matrix-bot-matrix-registration-bot/tasks/clean_cache.yml b/roles/custom/matrix-bot-matrix-registration-bot/tasks/clean_cache.yml index d5d590895..55a6bed5c 100644 --- a/roles/custom/matrix-bot-matrix-registration-bot/tasks/clean_cache.yml +++ b/roles/custom/matrix-bot-matrix-registration-bot/tasks/clean_cache.yml @@ -9,7 +9,7 @@ state: "{{ item }}" path: "{{ matrix_bot_matrix_registration_bot_data_path }}" mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - absent diff --git a/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml b/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml index c23ce719f..cc3ee82bb 100644 --- a/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml @@ -13,7 +13,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_bot_matrix_registration_bot_config_path }}", when: true} @@ -25,7 +25,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/config.yaml.j2" dest: "{{ matrix_bot_matrix_registration_bot_config_path }}/config.yaml" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 @@ -50,7 +50,7 @@ dest: "{{ matrix_bot_matrix_registration_bot_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_bot_matrix_registration_bot_git_pull_results - name: Ensure matrix-registration-bot image is built diff --git a/roles/custom/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml b/roles/custom/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml index ebe0815a2..4c8be3d4c 100644 --- a/roles/custom/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml @@ -43,7 +43,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_bot_matrix_reminder_bot_config_path }}", when: true} @@ -71,7 +71,7 @@ dest: "{{ matrix_bot_matrix_reminder_bot_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_bot_matrix_reminder_bot_git_pull_results when: "matrix_bot_matrix_reminder_bot_container_image_self_build | bool" @@ -92,7 +92,7 @@ content: "{{ matrix_bot_matrix_reminder_bot_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_bot_matrix_reminder_bot_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-reminder-bot container network is created diff --git a/roles/custom/matrix-bot-maubot/tasks/setup_install.yml b/roles/custom/matrix-bot-maubot/tasks/setup_install.yml index 973dff0c6..9f4a90270 100644 --- a/roles/custom/matrix-bot-maubot/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-maubot/tasks/setup_install.yml @@ -14,7 +14,7 @@ path: "{{ item.path }}" state: directory mode: 0755 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_bot_maubot_base_path }}", when: true} @@ -31,7 +31,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/config.yaml.j2" dest: "{{ matrix_bot_maubot_config_path }}/config.yaml" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: "u=rwx" @@ -56,7 +56,7 @@ dest: "{{ matrix_bot_maubot_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_bot_maubot_git_pull_results - name: Ensure maubot image is built @@ -76,7 +76,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/customizations/Dockerfile.j2" dest: "{{ matrix_bot_maubot_customized_docker_src_files_path }}/Dockerfile" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 register: matrix_bot_maubot_container_image_customizations_dockerfile_result @@ -96,7 +96,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_bot_maubot_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml b/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml index c533948f4..5562a3e2e 100644 --- a/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml @@ -18,7 +18,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_bot_mjolnir_base_path }}", when: true} @@ -46,7 +46,7 @@ version: "{{ matrix_bot_mjolnir_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_bot_mjolnir_git_pull_results when: "matrix_bot_mjolnir_container_image_self_build | bool" @@ -66,7 +66,7 @@ content: "{{ matrix_bot_mjolnir_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_bot_mjolnir_config_path }}/production.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-bot-mjolnir container network is created diff --git a/roles/custom/matrix-bridge-appservice-discord/tasks/setup_install.yml b/roles/custom/matrix-bridge-appservice-discord/tasks/setup_install.yml index 0fddef00e..0f1cb199f 100644 --- a/roles/custom/matrix-bridge-appservice-discord/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-appservice-discord/tasks/setup_install.yml @@ -56,7 +56,7 @@ path: "{{ item }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - "{{ matrix_appservice_discord_base_path }}" @@ -93,7 +93,7 @@ content: "{{ matrix_appservice_discord_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_discord_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure AppService Discord registration.yaml installed @@ -101,7 +101,7 @@ content: "{{ matrix_appservice_discord_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_discord_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" # If `matrix_appservice_discord_client_id` hasn't changed, the same invite link would be generated. diff --git a/roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml b/roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml index b4cb63c86..8e73c1b5d 100644 --- a/roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml @@ -22,7 +22,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_appservice_irc_base_path }}", when: true} @@ -97,7 +97,7 @@ dest: "{{ matrix_appservice_irc_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_appservice_irc_git_pull_results when: "matrix_appservice_irc_enabled | bool and matrix_appservice_irc_container_image_self_build | bool" @@ -118,7 +118,7 @@ content: "{{ matrix_appservice_irc_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_irc_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Generate Appservice IRC passkey if it doesn't exist @@ -126,7 +126,7 @@ cmd: "{{ matrix_host_command_openssl }} genpkey -out {{ matrix_appservice_irc_data_path }}/passkey.pem -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:2048" creates: "{{ matrix_appservice_irc_data_path }}/passkey.pem" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" # In the past, we used to generate the passkey.pem file with root, so permissions may not be okay. # Fix it. @@ -134,7 +134,7 @@ ansible.builtin.file: path: "{{ matrix_appservice_irc_data_path }}/passkey.pem" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" # Ideally, we'd like to generate the final registration.yaml file by ourselves. @@ -198,7 +198,7 @@ content: "{{ matrix_appservice_irc_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_irc_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-irc container network is created diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml index 3c3da6765..046b4a803 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml @@ -35,7 +35,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_appservice_kakaotalk_base_path }}", when: true} @@ -51,7 +51,7 @@ version: "{{ matrix_appservice_kakaotalk_container_image_self_build_repo_version }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_appservice_kakaotalk_git_pull_results when: "matrix_appservice_kakaotalk_container_image_self_build | bool" @@ -84,7 +84,7 @@ content: "{{ matrix_appservice_kakaotalk_node_configuration | to_nice_json }}" dest: "{{ matrix_appservice_kakaotalk_config_path }}/node-config.json" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-kakaotalk config.yaml installed @@ -92,7 +92,7 @@ content: "{{ matrix_appservice_kakaotalk_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_kakaotalk_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-kakaotalk registration.yaml installed @@ -100,7 +100,7 @@ content: "{{ matrix_appservice_kakaotalk_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_kakaotalk_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-kakaotalk container network is created diff --git a/roles/custom/matrix-bridge-appservice-slack/tasks/setup_install.yml b/roles/custom/matrix-bridge-appservice-slack/tasks/setup_install.yml index b556910f8..41a9f26d6 100644 --- a/roles/custom/matrix-bridge-appservice-slack/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-appservice-slack/tasks/setup_install.yml @@ -17,7 +17,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_appservice_slack_base_path }}", when: true} @@ -62,7 +62,7 @@ dest: "{{ matrix_appservice_slack_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_appservice_slack_git_pull_results when: "matrix_appservice_slack_container_image_self_build | bool" @@ -83,7 +83,7 @@ content: "{{ matrix_appservice_slack_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_slack_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure appservice-slack registration.yaml installed @@ -91,7 +91,7 @@ content: "{{ matrix_appservice_slack_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_slack_config_path }}/slack-registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-slack container network is created @@ -106,7 +106,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_appservice_slack_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-appservice-webhooks/tasks/setup_install.yml b/roles/custom/matrix-bridge-appservice-webhooks/tasks/setup_install.yml index 208399355..ccb8d31cd 100644 --- a/roles/custom/matrix-bridge-appservice-webhooks/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-appservice-webhooks/tasks/setup_install.yml @@ -17,7 +17,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_appservice_webhooks_base_path }}", when: true} @@ -47,7 +47,7 @@ version: "{{ matrix_appservice_webhooks_container_image_self_build_repo_version }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_appservice_webhooks_git_pull_results - name: Ensure matrix-appservice-webhooks container image is built @@ -66,7 +66,7 @@ content: "{{ matrix_appservice_webhooks_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_webhooks_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-webhooks schema.yml template exists @@ -74,7 +74,7 @@ src: "{{ role_path }}/templates/schema.yml.j2" dest: "{{ matrix_appservice_webhooks_config_path }}/schema.yml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-webhooks database.json template exists @@ -82,7 +82,7 @@ src: "{{ role_path }}/templates/database.json.j2" dest: "{{ matrix_appservice_webhooks_data_path }}/database.json" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure appservice-webhooks registration.yaml installed @@ -90,7 +90,7 @@ content: "{{ matrix_appservice_webhooks_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_appservice_webhooks_config_path }}/webhooks-registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-appservice-webhooks container network is created @@ -105,7 +105,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_appservice_webhooks_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml b/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml index e61dc18fb..016493665 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml @@ -16,7 +16,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_beeper_linkedin_base_path }}", when: true} @@ -30,7 +30,7 @@ content: "{{ matrix_beeper_linkedin_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_beeper_linkedin_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure beeper-linkedin registration.yaml installed @@ -38,7 +38,7 @@ content: "{{ matrix_beeper_linkedin_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_beeper_linkedin_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Beeper LinkedIn container image is pulled @@ -62,7 +62,7 @@ version: "{{ matrix_beeper_linkedin_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_beeper_linkedin_git_pull_results # Building the container image (using the default Dockerfile) requires that a docker-requirements.txt file be generated. diff --git a/roles/custom/matrix-bridge-go-skype-bridge/tasks/setup_install.yml b/roles/custom/matrix-bridge-go-skype-bridge/tasks/setup_install.yml index 5d05a3540..dc17fa5b8 100644 --- a/roles/custom/matrix-bridge-go-skype-bridge/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-go-skype-bridge/tasks/setup_install.yml @@ -40,7 +40,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_go_skype_bridge_base_path }}", when: true} @@ -68,7 +68,7 @@ version: "{{ matrix_go_skype_bridge_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_go_skype_bridge_git_pull_results when: "matrix_go_skype_bridge_container_image_self_build | bool" @@ -122,7 +122,7 @@ content: "{{ matrix_go_skype_bridge_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_go_skype_bridge_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure go-skype-bridge registration.yaml installed @@ -130,7 +130,7 @@ content: "{{ matrix_go_skype_bridge_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_go_skype_bridge_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-go-skype-bridge container network is created diff --git a/roles/custom/matrix-bridge-heisenbridge/tasks/setup_install.yml b/roles/custom/matrix-bridge-heisenbridge/tasks/setup_install.yml index a748464db..dd6ea070f 100644 --- a/roles/custom/matrix-bridge-heisenbridge/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-heisenbridge/tasks/setup_install.yml @@ -26,7 +26,7 @@ path: "{{ item }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - "{{ matrix_heisenbridge_base_path }}" @@ -36,7 +36,7 @@ content: "{{ matrix_heisenbridge_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_heisenbridge_base_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Heisenbridge support files installed @@ -44,7 +44,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_heisenbridge_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml b/roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml index a44edff15..f24a31260 100644 --- a/roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml @@ -21,7 +21,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_hookshot_base_path }}", when: true} @@ -47,7 +47,7 @@ version: "{{ matrix_hookshot_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_hookshot_git_pull_results when: "matrix_hookshot_container_image_self_build | bool" @@ -73,7 +73,7 @@ cmd: "{{ matrix_host_command_openssl }} genpkey -out {{ matrix_hookshot_base_path }}/passkey.pem -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:4096" creates: "{{ matrix_hookshot_base_path }}/passkey.pem" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" when: "not hookshot_passkey_file.stat.exists" - name: Ensure hookshot config.yml installed if provided @@ -81,7 +81,7 @@ content: "{{ matrix_hookshot_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_hookshot_base_path }}/config.yml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Validate hookshot config.yml @@ -107,7 +107,7 @@ content: "{{ matrix_hookshot_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_hookshot_base_path }}/registration.yml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure hookshot github private key file installed if github is enabled @@ -115,7 +115,7 @@ content: "{{ matrix_hookshot_github_private_key }}" dest: "{{ matrix_hookshot_base_path }}/{{ matrix_hookshot_github_private_key_file }}" mode: 0400 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" when: matrix_hookshot_github_enabled | bool and matrix_hookshot_github_private_key|length > 0 @@ -131,7 +131,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_hookshot_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml index 305ac5730..ff650b28c 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml @@ -24,7 +24,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_bluesky_base_path }}", when: true} @@ -40,7 +40,7 @@ dest: "{{ matrix_mautrix_bluesky_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_bluesky_git_pull_results when: "matrix_mautrix_bluesky_enabled | bool and matrix_mautrix_bluesky_container_image_self_build" @@ -60,7 +60,7 @@ content: "{{ matrix_mautrix_bluesky_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_bluesky_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-bluesky registration.yaml installed @@ -68,7 +68,7 @@ content: "{{ matrix_mautrix_bluesky_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_bluesky_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-bluesky support files installed @@ -76,7 +76,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_bluesky_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml index e08b1c34c..05281e3ac 100644 --- a/roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml @@ -40,7 +40,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_discord_base_path }}", when: true} @@ -68,7 +68,7 @@ version: "{{ matrix_mautrix_discord_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_discord_git_pull_results when: "matrix_mautrix_discord_container_image_self_build | bool" @@ -89,7 +89,7 @@ content: "{{ matrix_mautrix_discord_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_discord_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-discord registration.yaml installed @@ -97,7 +97,7 @@ content: "{{ matrix_mautrix_discord_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_discord_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-discord support files installed @@ -105,7 +105,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_discord_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-facebook/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-facebook/tasks/setup_install.yml index 36fe8fabb..f762595a5 100644 --- a/roles/custom/matrix-bridge-mautrix-facebook/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-facebook/tasks/setup_install.yml @@ -59,7 +59,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_facebook_base_path }}", when: true} @@ -75,7 +75,7 @@ version: "{{ matrix_mautrix_facebook_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_facebook_git_pull_results when: "matrix_mautrix_facebook_container_image_self_build | bool" @@ -117,7 +117,7 @@ content: "{{ matrix_mautrix_facebook_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_facebook_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-facebook registration.yaml installed @@ -125,7 +125,7 @@ content: "{{ matrix_mautrix_facebook_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_facebook_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-facebook support files installed @@ -133,7 +133,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_facebook_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-gmessages/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-gmessages/tasks/setup_install.yml index 777dceab7..27edc3367 100644 --- a/roles/custom/matrix-bridge-mautrix-gmessages/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-gmessages/tasks/setup_install.yml @@ -40,7 +40,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_gmessages_base_path }}", when: true} @@ -68,7 +68,7 @@ version: "{{ matrix_mautrix_gmessages_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_gmessages_git_pull_results when: "matrix_mautrix_gmessages_container_image_self_build | bool" @@ -122,7 +122,7 @@ content: "{{ matrix_mautrix_gmessages_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_gmessages_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-gmessages registration.yaml installed @@ -130,7 +130,7 @@ content: "{{ matrix_mautrix_gmessages_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_gmessages_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-mautrix-gmessages.service installed @@ -144,7 +144,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_gmessages_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml index d7cc1f1d5..7c29da69f 100644 --- a/roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml @@ -54,7 +54,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_googlechat_base_path }}", when: true} @@ -70,7 +70,7 @@ dest: "{{ matrix_mautrix_googlechat_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_googlechat_git_pull_results when: "matrix_mautrix_googlechat_container_image_self_build | bool" @@ -112,7 +112,7 @@ content: "{{ matrix_mautrix_googlechat_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_googlechat_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-googlechat registration.yaml installed @@ -120,7 +120,7 @@ content: "{{ matrix_mautrix_googlechat_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_googlechat_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-googlechat support files installed @@ -128,7 +128,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_googlechat_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-instagram/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-instagram/tasks/setup_install.yml index 21e4e5f44..3209b4b87 100644 --- a/roles/custom/matrix-bridge-mautrix-instagram/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-instagram/tasks/setup_install.yml @@ -27,7 +27,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_instagram_base_path }}", when: true} @@ -43,7 +43,7 @@ dest: "{{ matrix_mautrix_instagram_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_instagram_git_pull_results when: "matrix_mautrix_instagram_container_image_self_build | bool" @@ -64,7 +64,7 @@ content: "{{ matrix_mautrix_instagram_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_instagram_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-instagram registration.yaml installed @@ -72,7 +72,7 @@ content: "{{ matrix_mautrix_instagram_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_instagram_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-instagram support files installed @@ -80,7 +80,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_instagram_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml b/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml index 4f3749c1e..c517ef2cf 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml @@ -49,7 +49,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_meta_instagram_base_path }}", when: true} @@ -67,7 +67,7 @@ version: "{{ matrix_mautrix_meta_instagram_container_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_meta_instagram_git_pull_results - name: Ensure mautrix-meta-instagram container image is built @@ -86,7 +86,7 @@ content: "{{ matrix_mautrix_meta_instagram_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_meta_instagram_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-meta-instagram registration.yaml installed @@ -94,7 +94,7 @@ content: "{{ matrix_mautrix_meta_instagram_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_meta_instagram_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-meta-instagram support files installed @@ -102,7 +102,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_meta_instagram_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml b/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml index ef09d425b..703fd5f31 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml @@ -49,7 +49,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_meta_messenger_base_path }}", when: true} @@ -67,7 +67,7 @@ version: "{{ matrix_mautrix_meta_messenger_container_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_meta_messenger_git_pull_results - name: Ensure mautrix-meta-messenger container image is built @@ -86,7 +86,7 @@ content: "{{ matrix_mautrix_meta_messenger_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_meta_messenger_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-meta-messenger registration.yaml installed @@ -94,7 +94,7 @@ content: "{{ matrix_mautrix_meta_messenger_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_meta_messenger_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-meta-messenger support files installed @@ -102,7 +102,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_meta_messenger_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml index 55bcb2cb4..17f9beb93 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml @@ -45,7 +45,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_signal_base_path }}", when: true} @@ -73,7 +73,7 @@ version: "{{ matrix_mautrix_signal_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_signal_git_pull_results when: "matrix_mautrix_signal_container_image_self_build | bool" @@ -127,7 +127,7 @@ content: "{{ matrix_mautrix_signal_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_signal_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-signal registration.yaml installed @@ -135,7 +135,7 @@ content: "{{ matrix_mautrix_signal_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_signal_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-signal support files installed @@ -143,7 +143,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_signal_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-slack/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-slack/tasks/setup_install.yml index c5266dfff..ead4869bb 100644 --- a/roles/custom/matrix-bridge-mautrix-slack/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-slack/tasks/setup_install.yml @@ -39,7 +39,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_slack_base_path }}", when: true} @@ -67,7 +67,7 @@ version: "{{ matrix_mautrix_slack_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_slack_git_pull_results when: "matrix_mautrix_slack_container_image_self_build | bool" @@ -88,7 +88,7 @@ content: "{{ matrix_mautrix_slack_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_slack_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-slack registration.yaml installed @@ -96,7 +96,7 @@ content: "{{ matrix_mautrix_slack_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_slack_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-mautrix-slack container network is created diff --git a/roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml index f45cd306f..c0fd1e54a 100644 --- a/roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml @@ -49,7 +49,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_telegram_base_path }}", when: true} @@ -77,7 +77,7 @@ dest: "{{ matrix_mautrix_telegram_lottieconverter_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_telegram_lottieconverter_git_pull_results when: "matrix_mautrix_telegram_lottieconverter_container_image_self_build | bool and matrix_mautrix_telegram_container_image_self_build | bool" @@ -100,7 +100,7 @@ dest: "{{ matrix_mautrix_telegram_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_telegram_git_pull_results when: "matrix_mautrix_telegram_container_image_self_build | bool" @@ -144,7 +144,7 @@ content: "{{ matrix_mautrix_telegram_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_telegram_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-telegram registration.yaml installed @@ -152,7 +152,7 @@ content: "{{ matrix_mautrix_telegram_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_telegram_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-telegram support files installed @@ -160,7 +160,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_telegram_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml index 4e5b1d149..cd7ab9de5 100644 --- a/roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml @@ -30,7 +30,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_twitter_base_path }}", when: true} @@ -46,7 +46,7 @@ dest: "{{ matrix_mautrix_twitter_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_twitter_git_pull_results when: "matrix_mautrix_twitter_enabled | bool and matrix_mautrix_twitter_container_image_self_build" @@ -66,7 +66,7 @@ content: "{{ matrix_mautrix_twitter_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_twitter_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-twitter registration.yaml installed @@ -74,7 +74,7 @@ content: "{{ matrix_mautrix_twitter_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_twitter_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-twitter support files installed @@ -82,7 +82,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_twitter_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml index ecafc5a32..cdc1c6e74 100644 --- a/roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml @@ -50,7 +50,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mautrix_whatsapp_base_path }}", when: true} @@ -78,7 +78,7 @@ version: "{{ matrix_mautrix_whatsapp_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mautrix_whatsapp_git_pull_results when: "matrix_mautrix_whatsapp_container_image_self_build | bool" @@ -132,7 +132,7 @@ content: "{{ matrix_mautrix_whatsapp_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_whatsapp_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-whatsapp registration.yaml installed @@ -140,7 +140,7 @@ content: "{{ matrix_mautrix_whatsapp_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mautrix_whatsapp_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-whatsapp support files installed @@ -148,7 +148,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_whatsapp_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml index 9685df0e0..784df7b6c 100644 --- a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml @@ -26,7 +26,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - path: "{{ matrix_mautrix_wsproxy_base_path }}" @@ -38,7 +38,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mautrix_wsproxy_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - syncproxy-env @@ -63,7 +63,7 @@ path: "{{ item }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - "{{ matrix_mautrix_wsproxy_base_path }}" @@ -79,7 +79,7 @@ content: "{{ matrix_mautrix_wsproxy_configuration | to_nice_yaml }}" dest: "{{ matrix_mautrix_wsproxy_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-androidsms registration.yaml installed @@ -87,7 +87,7 @@ content: "{{ matrix_mautrix_androidsms_registration | to_nice_yaml }}" dest: "{{ matrix_mautrix_wsproxy_config_path }}/androidsms-registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-imessage registration.yaml installed @@ -95,7 +95,7 @@ content: "{{ matrix_mautrix_imessage_registration | to_nice_yaml }}" dest: "{{ matrix_mautrix_wsproxy_config_path }}/imessage-registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mautrix-wsproxy container network is created diff --git a/roles/custom/matrix-bridge-mx-puppet-discord/tasks/setup_install.yml b/roles/custom/matrix-bridge-mx-puppet-discord/tasks/setup_install.yml index af1717a0f..0dba68c99 100644 --- a/roles/custom/matrix-bridge-mx-puppet-discord/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mx-puppet-discord/tasks/setup_install.yml @@ -16,7 +16,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mx_puppet_discord_base_path }}", when: true} @@ -91,7 +91,7 @@ force: "yes" version: "{{ matrix_mx_puppet_discord_container_image_self_build_version }}" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mx_puppet_discord_git_pull_results when: "matrix_mx_puppet_discord_enabled | bool and matrix_mx_puppet_discord_container_image_self_build" @@ -112,7 +112,7 @@ content: "{{ matrix_mx_puppet_discord_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_discord_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-discord discord-registration.yaml installed @@ -120,7 +120,7 @@ content: "{{ matrix_mx_puppet_discord_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_discord_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-discord container network is created diff --git a/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml b/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml index 5e09ca887..6ecf1a7c1 100644 --- a/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml @@ -15,7 +15,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mx_puppet_groupme_base_path }}", when: true} @@ -91,7 +91,7 @@ dest: "{{ matrix_mx_puppet_groupme_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mx_puppet_groupme_git_pull_results when: "matrix_mx_puppet_groupme_enabled | bool and matrix_mx_puppet_groupme_container_image_self_build" @@ -112,7 +112,7 @@ content: "{{ matrix_mx_puppet_groupme_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_groupme_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-groupme groupme-registration.yaml installed @@ -120,7 +120,7 @@ content: "{{ matrix_mx_puppet_groupme_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_groupme_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-groupme container network is created diff --git a/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml b/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml index 1846ede1f..93ffa15e2 100644 --- a/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mx-puppet-instagram/tasks/setup_install.yml @@ -55,7 +55,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mx_puppet_instagram_base_path }}", when: true} @@ -71,7 +71,7 @@ dest: "{{ matrix_mx_puppet_instagram_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mx_puppet_instagram_git_pull_results when: "matrix_mx_puppet_instagram_enabled | bool and matrix_mx_puppet_instagram_container_image_self_build | bool" @@ -92,7 +92,7 @@ content: "{{ matrix_mx_puppet_instagram_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_instagram_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-instagram-registration.yaml installed @@ -100,7 +100,7 @@ content: "{{ matrix_mx_puppet_instagram_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_instagram_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-instagram container network is created diff --git a/roles/custom/matrix-bridge-mx-puppet-slack/tasks/setup_install.yml b/roles/custom/matrix-bridge-mx-puppet-slack/tasks/setup_install.yml index 55e0cdecf..c525a689a 100644 --- a/roles/custom/matrix-bridge-mx-puppet-slack/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mx-puppet-slack/tasks/setup_install.yml @@ -11,7 +11,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mx_puppet_slack_base_path }}", when: true} @@ -80,7 +80,7 @@ force: "yes" version: "{{ matrix_mx_puppet_slack_container_image_self_build_version }}" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mx_puppet_slack_git_pull_results when: "matrix_mx_puppet_slack_enabled | bool and matrix_mx_puppet_slack_container_image_self_build" @@ -108,7 +108,7 @@ content: "{{ matrix_mx_puppet_slack_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_slack_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-slack slack-registration.yaml installed @@ -116,7 +116,7 @@ content: "{{ matrix_mx_puppet_slack_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_slack_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-slack support files installed @@ -124,7 +124,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mx_puppet_slack_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml b/roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml index 298913aec..7b921d29a 100644 --- a/roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml @@ -17,7 +17,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mx_puppet_steam_base_path }}", when: true} @@ -93,7 +93,7 @@ dest: "{{ matrix_mx_puppet_steam_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mx_puppet_steam_git_pull_results when: "matrix_mx_puppet_steam_enabled | bool and matrix_mx_puppet_steam_container_image_self_build" @@ -114,7 +114,7 @@ content: "{{ matrix_mx_puppet_steam_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_steam_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-steam steam-registration.yaml installed @@ -122,7 +122,7 @@ content: "{{ matrix_mx_puppet_steam_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_steam_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-steam container network is created diff --git a/roles/custom/matrix-bridge-mx-puppet-twitter/tasks/setup_install.yml b/roles/custom/matrix-bridge-mx-puppet-twitter/tasks/setup_install.yml index 2f6a7807e..d5ae0f73e 100644 --- a/roles/custom/matrix-bridge-mx-puppet-twitter/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mx-puppet-twitter/tasks/setup_install.yml @@ -16,7 +16,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_mx_puppet_twitter_base_path }}", when: true} @@ -92,7 +92,7 @@ dest: "{{ matrix_mx_puppet_twitter_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_mx_puppet_twitter_git_pull_results when: "matrix_mx_puppet_twitter_enabled | bool and matrix_mx_puppet_twitter_container_image_self_build" @@ -113,7 +113,7 @@ content: "{{ matrix_mx_puppet_twitter_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_twitter_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-twitter twitter-registration.yaml installed @@ -121,7 +121,7 @@ content: "{{ matrix_mx_puppet_twitter_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_mx_puppet_twitter_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure mx-puppet-twitter support files installed @@ -129,7 +129,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_mx_puppet_twitter_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml b/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml index 4dc78ddc7..f9b5af5c0 100644 --- a/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml @@ -61,7 +61,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_postmoogle_config_path }}", when: true} @@ -73,7 +73,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/env.j2" dest: "{{ matrix_postmoogle_config_path }}/env" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 @@ -96,7 +96,7 @@ dest: "{{ matrix_postmoogle_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_postmoogle_git_pull_results when: "matrix_postmoogle_container_image_self_build | bool" diff --git a/roles/custom/matrix-bridge-sms/tasks/setup_install.yml b/roles/custom/matrix-bridge-sms/tasks/setup_install.yml index a46bc21dc..7b49eca78 100644 --- a/roles/custom/matrix-bridge-sms/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-sms/tasks/setup_install.yml @@ -24,7 +24,7 @@ path: "{{ item }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - "{{ matrix_sms_bridge_base_path }}" @@ -36,7 +36,7 @@ content: "{{ matrix_sms_bridge_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_sms_bridge_config_path }}/application.yml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-sms-bridge registration.yaml installed @@ -44,7 +44,7 @@ content: "{{ matrix_sms_bridge_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_sms_bridge_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure android-sms-gateway-server cert installed @@ -52,7 +52,7 @@ src: "{{ matrix_sms_bridge_provider_android_truststore_local_path }}" dest: "{{ matrix_sms_bridge_config_path }}/matrix-sms-gateway-server.p12" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" when: matrix_sms_bridge_provider_android_truststore_local_path != "" diff --git a/roles/custom/matrix-bridge-wechat/tasks/install.yml b/roles/custom/matrix-bridge-wechat/tasks/install.yml index 607ca780b..d9da1d2fc 100644 --- a/roles/custom/matrix-bridge-wechat/tasks/install.yml +++ b/roles/custom/matrix-bridge-wechat/tasks/install.yml @@ -10,7 +10,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_wechat_base_path }}", when: true} @@ -41,7 +41,7 @@ version: "{{ matrix_wechat_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_wechat_git_pull_results - name: Ensure WeChat Bridge container image is built @@ -76,7 +76,7 @@ version: "{{ matrix_wechat_agent_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_wechat_agent_git_pull_results - name: Ensure WeChat Agent container image is built @@ -95,7 +95,7 @@ content: "{{ matrix_wechat_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_wechat_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure WeChat registration.yaml installed @@ -103,7 +103,7 @@ content: "{{ matrix_wechat_registration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_wechat_config_path }}/registration.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Wechat Agent configuration installed @@ -111,7 +111,7 @@ content: "{{ matrix_wechat_agent_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_wechat_config_path }}/agent-config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-wechat container network is created diff --git a/roles/custom/matrix-cactus-comments-client/tasks/install.yml b/roles/custom/matrix-cactus-comments-client/tasks/install.yml index 6a86df4ce..b8c91241c 100644 --- a/roles/custom/matrix-cactus-comments-client/tasks/install.yml +++ b/roles/custom/matrix-cactus-comments-client/tasks/install.yml @@ -10,7 +10,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_cactus_comments_client_base_path }}", when: true} @@ -21,7 +21,7 @@ ansible.builtin.template: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0644 with_items: @@ -38,14 +38,14 @@ url: "{{ matrix_cactus_comments_client_webclient_js_url }}" dest: "{{ matrix_cactus_comments_client_public_path }}/cactus.js" mode: "{{ matrix_cactus_comments_client_public_path_file_permissions }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Download web client css ansible.builtin.get_url: url: "{{ matrix_cactus_comments_client_webclient_css_url }}" dest: "{{ matrix_cactus_comments_client_public_path }}/style.css" mode: "{{ matrix_cactus_comments_client_public_path_file_permissions }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - when: matrix_cactus_comments_client_local_dir | length > 0 @@ -55,14 +55,14 @@ src: "{{ matrix_cactus_comments_client_local_dir }}/src/cactus.js" dest: "{{ matrix_cactus_comments_client_public_path }}/cactus.js" mode: "{{ matrix_cactus_comments_client_public_path_file_permissions }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Upload locally distributed client CSS ansible.builtin.copy: src: "{{ matrix_cactus_comments_client_local_dir }}/src/style.css" dest: "{{ matrix_cactus_comments_client_public_path }}/style.css" mode: "{{ matrix_cactus_comments_client_public_path_file_permissions }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-cactus-comments-client container image is pulled diff --git a/roles/custom/matrix-cactus-comments/tasks/setup_install.yml b/roles/custom/matrix-cactus-comments/tasks/setup_install.yml index 5e6219746..2e0fca1b3 100644 --- a/roles/custom/matrix-cactus-comments/tasks/setup_install.yml +++ b/roles/custom/matrix-cactus-comments/tasks/setup_install.yml @@ -11,7 +11,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_cactus_comments_base_path }}", when: true} @@ -23,7 +23,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/env.j2" dest: "{{ matrix_cactus_comments_app_service_env_file }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 @@ -31,7 +31,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/cactus_appservice.yaml.j2" dest: "{{ matrix_cactus_comments_app_service_config_file }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 @@ -54,7 +54,7 @@ dest: "{{ matrix_cactus_comments_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_cactus_comments_git_pull_results when: "matrix_cactus_comments_container_image_self_build | bool" diff --git a/roles/custom/matrix-client-cinny/tasks/setup_install.yml b/roles/custom/matrix-client-cinny/tasks/setup_install.yml index 228aa0614..6eb32a5d9 100644 --- a/roles/custom/matrix-client-cinny/tasks/setup_install.yml +++ b/roles/custom/matrix-client-cinny/tasks/setup_install.yml @@ -13,7 +13,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_client_cinny_data_path }}", when: true} @@ -39,7 +39,7 @@ version: "{{ matrix_client_cinny_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_client_cinny_git_pull_results when: "matrix_client_cinny_container_image_self_build | bool" @@ -48,7 +48,7 @@ content: "{{ matrix_client_cinny_configuration | to_nice_json }}" dest: "{{ matrix_client_cinny_data_path }}/config.json" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Cinny additional config files installed @@ -56,7 +56,7 @@ src: "{{ item.src }}" dest: "{{ matrix_client_cinny_data_path }}/{{ item.name }}" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {src: "{{ role_path }}/templates/nginx.conf.j2", name: "nginx.conf"} diff --git a/roles/custom/matrix-client-element/tasks/setup_install.yml b/roles/custom/matrix-client-element/tasks/setup_install.yml index 10a8b61ae..ad4218a3d 100644 --- a/roles/custom/matrix-client-element/tasks/setup_install.yml +++ b/roles/custom/matrix-client-element/tasks/setup_install.yml @@ -16,7 +16,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_client_element_data_path }}", when: true} @@ -42,7 +42,7 @@ version: "{{ matrix_client_element_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_client_element_git_pull_results when: "matrix_client_element_container_image_self_build | bool" @@ -75,7 +75,7 @@ content: "{{ matrix_client_element_configuration | to_nice_json }}" dest: "{{ matrix_client_element_data_path }}/config.json" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Element location sharing map style installed @@ -84,7 +84,7 @@ content: "{{ matrix_client_element_location_sharing_map_style | to_nice_json }}" dest: "{{ matrix_client_element_data_path }}/map_style.json" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Element Web config files installed @@ -92,7 +92,7 @@ src: "{{ item.src }}" dest: "{{ matrix_client_element_data_path }}/{{ item.name }}" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {src: "{{ role_path }}/templates/labels.j2", name: "labels"} diff --git a/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml b/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml index a774ad724..f0744a54e 100644 --- a/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml +++ b/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml @@ -9,7 +9,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_client_fluffychat_data_path }}", when: true} @@ -37,7 +37,7 @@ version: "{{ matrix_client_fluffychat_container_image_self_build_version }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_client_fluffychat_git_pull_results - name: Ensure FluffyChat Web container image is built @@ -54,7 +54,7 @@ src: "{{ item.src }}" dest: "{{ matrix_client_fluffychat_data_path }}/{{ item.name }}" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {src: "{{ role_path }}/templates/labels.j2", name: "labels"} diff --git a/roles/custom/matrix-client-hydrogen/tasks/setup_install.yml b/roles/custom/matrix-client-hydrogen/tasks/setup_install.yml index f720fe5f5..e0c405aa9 100644 --- a/roles/custom/matrix-client-hydrogen/tasks/setup_install.yml +++ b/roles/custom/matrix-client-hydrogen/tasks/setup_install.yml @@ -16,7 +16,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_client_hydrogen_data_path }}", when: true} @@ -32,7 +32,7 @@ version: "{{ matrix_client_hydrogen_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_client_hydrogen_git_pull_results - name: Check if Hydrogen Docker image exists @@ -73,7 +73,7 @@ content: "{{ matrix_client_hydrogen_configuration | to_nice_json }}" dest: "{{ matrix_client_hydrogen_data_path }}/config.json" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Hydrogen additional config files installed @@ -81,7 +81,7 @@ src: "{{ item.src }}" dest: "{{ matrix_client_hydrogen_data_path }}/{{ item.name }}" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {src: "{{ role_path }}/templates/nginx.conf.j2", name: "nginx.conf"} diff --git a/roles/custom/matrix-client-schildichat/tasks/setup_install.yml b/roles/custom/matrix-client-schildichat/tasks/setup_install.yml index 2a577df58..47d5f0fae 100644 --- a/roles/custom/matrix-client-schildichat/tasks/setup_install.yml +++ b/roles/custom/matrix-client-schildichat/tasks/setup_install.yml @@ -13,7 +13,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_client_schildichat_data_path }}", when: true} @@ -41,7 +41,7 @@ version: "{{ matrix_client_schildichat_container_image_self_build_version }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_client_schildichat_git_pull_results # See: @@ -72,7 +72,7 @@ content: "{{ matrix_client_schildichat_configuration | to_nice_json }}" dest: "{{ matrix_client_schildichat_data_path }}/config.json" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure SchildiChat location sharing map style installed @@ -81,7 +81,7 @@ content: "{{ matrix_client_schildichat_location_sharing_map_style | to_nice_json }}" dest: "{{ matrix_client_schildichat_data_path }}/map_style.json" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure SchildiChat Web config files installed @@ -89,7 +89,7 @@ src: "{{ item.src }}" dest: "{{ matrix_client_schildichat_data_path }}/{{ item.name }}" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {src: "{{ role_path }}/templates/labels.j2", name: "labels"} diff --git a/roles/custom/matrix-conduit/tasks/setup_install.yml b/roles/custom/matrix-conduit/tasks/setup_install.yml index a4a65b097..b82b94e85 100644 --- a/roles/custom/matrix-conduit/tasks/setup_install.yml +++ b/roles/custom/matrix-conduit/tasks/setup_install.yml @@ -13,7 +13,7 @@ path: "{{ matrix_conduit_config_path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Conduit data path exists @@ -21,7 +21,7 @@ path: "{{ matrix_conduit_data_path }}" state: directory mode: 0770 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Conduit configuration installed @@ -29,7 +29,7 @@ src: "{{ matrix_conduit_template_conduit_config }}" dest: "{{ matrix_conduit_config_path }}/conduit.toml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Conduit support files installed @@ -37,7 +37,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_conduit_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-conduwuit/tasks/install.yml b/roles/custom/matrix-conduwuit/tasks/install.yml index aa489386e..8b1e95a5a 100644 --- a/roles/custom/matrix-conduwuit/tasks/install.yml +++ b/roles/custom/matrix-conduwuit/tasks/install.yml @@ -9,7 +9,7 @@ path: "{{ matrix_conduwuit_config_path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure conduwuit data path exists @@ -17,7 +17,7 @@ path: "{{ matrix_conduwuit_data_path }}" state: directory mode: 0770 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure conduwuit configuration installed @@ -25,7 +25,7 @@ src: "{{ matrix_conduwuit_template_conduwuit_config }}" dest: "{{ matrix_conduwuit_config_path }}/conduwuit.toml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure conduwuit support files installed @@ -33,7 +33,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_conduwuit_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-conduwuit/tasks/setup_install.yml b/roles/custom/matrix-conduwuit/tasks/setup_install.yml index 4a5651fcf..6da4e27b0 100644 --- a/roles/custom/matrix-conduwuit/tasks/setup_install.yml +++ b/roles/custom/matrix-conduwuit/tasks/setup_install.yml @@ -9,7 +9,7 @@ path: "{{ matrix_conduwuit_config_path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure conduwuit data path exists @@ -17,7 +17,7 @@ path: "{{ matrix_conduwuit_data_path }}" state: directory mode: 0770 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure conduwuit configuration installed @@ -25,7 +25,7 @@ src: "{{ matrix_conduwuit_template_conduwuit_config }}" dest: "{{ matrix_conduwuit_config_path }}/conduwuit.toml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure conduwuit support files installed @@ -33,7 +33,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_conduwuit_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-continuwuity/tasks/install.yml b/roles/custom/matrix-continuwuity/tasks/install.yml index 19aaff4f2..11de27495 100644 --- a/roles/custom/matrix-continuwuity/tasks/install.yml +++ b/roles/custom/matrix-continuwuity/tasks/install.yml @@ -9,7 +9,7 @@ path: "{{ matrix_continuwuity_config_path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure continuwuity data path exists @@ -17,7 +17,7 @@ path: "{{ matrix_continuwuity_data_path }}" state: directory mode: 0770 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure continuwuity configuration installed @@ -25,7 +25,7 @@ src: "{{ matrix_continuwuity_template_continuwuity_config }}" dest: "{{ matrix_continuwuity_config_path }}/continuwuity.toml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure continuwuity support files installed @@ -33,7 +33,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_continuwuity_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-continuwuity/tasks/migrate_from_conduwuit.yml b/roles/custom/matrix-continuwuity/tasks/migrate_from_conduwuit.yml index 4f8bb6444..66352458f 100644 --- a/roles/custom/matrix-continuwuity/tasks/migrate_from_conduwuit.yml +++ b/roles/custom/matrix-continuwuity/tasks/migrate_from_conduwuit.yml @@ -63,7 +63,7 @@ ansible.builtin.file: path: "{{ matrix_base_data_path }}/continuwuity" state: directory - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" recurse: true @@ -71,7 +71,7 @@ ansible.builtin.file: path: "{{ matrix_base_data_path }}/continuwuity_old" state: directory - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" recurse: true diff --git a/roles/custom/matrix-continuwuity/tasks/setup_install.yml b/roles/custom/matrix-continuwuity/tasks/setup_install.yml index 8b86cb216..a258ae8d0 100644 --- a/roles/custom/matrix-continuwuity/tasks/setup_install.yml +++ b/roles/custom/matrix-continuwuity/tasks/setup_install.yml @@ -9,7 +9,7 @@ path: "{{ matrix_continuwuity_config_path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure continuwuity data path exists @@ -17,7 +17,7 @@ path: "{{ matrix_continuwuity_data_path }}" state: directory mode: 0770 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure continuwuity configuration installed @@ -25,7 +25,7 @@ src: "{{ matrix_continuwuity_template_continuwuity_config }}" dest: "{{ matrix_continuwuity_config_path }}/continuwuity.toml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure continuwuity support files installed @@ -33,7 +33,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_continuwuity_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-corporal/tasks/setup_install.yml b/roles/custom/matrix-corporal/tasks/setup_install.yml index cdbf3af87..e69617562 100644 --- a/roles/custom/matrix-corporal/tasks/setup_install.yml +++ b/roles/custom/matrix-corporal/tasks/setup_install.yml @@ -16,7 +16,7 @@ path: "{{ item }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - "{{ matrix_corporal_base_path }}" @@ -31,7 +31,7 @@ version: "{{ matrix_corporal_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_corporal_git_pull_results when: matrix_corporal_container_image_self_build | bool @@ -64,7 +64,7 @@ content: "{{ matrix_corporal_configuration | to_nice_json }}" dest: "{{ matrix_corporal_config_dir_path }}/config.json" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Matrix Corporal support files installed @@ -72,7 +72,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_corporal_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-coturn/tasks/setup_install.yml b/roles/custom/matrix-coturn/tasks/setup_install.yml index 697edb4ee..888916080 100644 --- a/roles/custom/matrix-coturn/tasks/setup_install.yml +++ b/roles/custom/matrix-coturn/tasks/setup_install.yml @@ -51,7 +51,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_coturn_docker_src_files_path }}", when: "{{ matrix_coturn_container_image_self_build }}"} @@ -78,7 +78,7 @@ version: "{{ matrix_coturn_container_image_self_build_repo_version }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_coturn_git_pull_results - name: Ensure coturn Docker image is built @@ -97,7 +97,7 @@ path: "{{ matrix_coturn_base_path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure turnserver.conf installed @@ -105,7 +105,7 @@ src: "{{ role_path }}/templates/turnserver.conf.j2" dest: "{{ matrix_coturn_config_path }}" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure coturn network is created in Docker diff --git a/roles/custom/matrix-dendrite/tasks/setup_install.yml b/roles/custom/matrix-dendrite/tasks/setup_install.yml index 262f16d04..4d78a3ecc 100644 --- a/roles/custom/matrix-dendrite/tasks/setup_install.yml +++ b/roles/custom/matrix-dendrite/tasks/setup_install.yml @@ -15,7 +15,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - path: "{{ matrix_dendrite_config_dir_path }}" @@ -44,7 +44,7 @@ path: "{{ matrix_dendrite_media_store_path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" when: "not local_path_media_store_stat.failed and not local_path_media_store_stat.stat.exists" @@ -79,7 +79,7 @@ ansible.builtin.file: path: "{{ matrix_dendrite_config_dir_path }}/{{ matrix_server_fqn_matrix }}.signing.pem" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Dendrite configuration installed @@ -87,7 +87,7 @@ content: "{{ matrix_dendrite_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_dendrite_config_dir_path }}/dendrite.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - when: "matrix_dendrite_container_image_self_build | bool" @@ -99,7 +99,7 @@ version: "{{ matrix_dendrite_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_dendrite_git_pull_results - name: Check if Dendrite Docker image exists @@ -130,7 +130,7 @@ src: "{{ item.src }}" dest: "{{ item.dest }}" mode: "{{ item.mode }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - src: labels.j2 diff --git a/roles/custom/matrix-dimension/tasks/setup_install.yml b/roles/custom/matrix-dimension/tasks/setup_install.yml index 5aaeb6d1e..de02329f1 100644 --- a/roles/custom/matrix-dimension/tasks/setup_install.yml +++ b/roles/custom/matrix-dimension/tasks/setup_install.yml @@ -87,7 +87,7 @@ path: "{{ matrix_dimension_base_path }}" state: directory mode: 0770 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_dimension_user_gid }}" - name: Ensure Dimension config installed @@ -95,7 +95,7 @@ content: "{{ matrix_dimension_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_dimension_base_path }}/config.yaml" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_dimension_user_gid }}" - name: Ensure Dimension labels installed @@ -103,7 +103,7 @@ src: "{{ role_path }}/templates/labels.j2" dest: "{{ matrix_dimension_base_path }}/labels" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Dimension image is pulled @@ -125,7 +125,7 @@ version: "{{ matrix_dimension_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" when: "matrix_dimension_container_image_self_build | bool" register: matrix_dimension_git_pull_results diff --git a/roles/custom/matrix-dynamic-dns/tasks/setup_install.yml b/roles/custom/matrix-dynamic-dns/tasks/setup_install.yml index 45eac171d..e1b4a091d 100644 --- a/roles/custom/matrix-dynamic-dns/tasks/setup_install.yml +++ b/roles/custom/matrix-dynamic-dns/tasks/setup_install.yml @@ -26,7 +26,7 @@ path: "{{ item.path }}" state: directory mode: 0751 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_dynamic_dns_base_path }}", when: true} @@ -41,7 +41,7 @@ dest: "{{ matrix_dynamic_dns_docker_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_dynamic_dns_git_pull_results when: "matrix_dynamic_dns_enabled | bool and matrix_dynamic_dns_container_image_self_build | bool" @@ -62,7 +62,7 @@ src: "{{ role_path }}/templates/ddclient.conf.j2" dest: "{{ matrix_dynamic_dns_config_path }}/ddclient.conf" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-dynamic-dns container network is created diff --git a/roles/custom/matrix-element-call/tasks/install.yml b/roles/custom/matrix-element-call/tasks/install.yml index 49c3078f8..021668afc 100644 --- a/roles/custom/matrix-element-call/tasks/install.yml +++ b/roles/custom/matrix-element-call/tasks/install.yml @@ -11,7 +11,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - path: "{{ matrix_element_call_base_path }}" @@ -21,7 +21,7 @@ src: "{{ role_path }}/templates/config.json.j2" dest: "{{ matrix_element_call_base_path }}/config.json" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Element Call container labels file is in place @@ -29,7 +29,7 @@ src: "{{ role_path }}/templates/labels.j2" dest: "{{ matrix_element_call_base_path }}/labels" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Element Call container image is pulled diff --git a/roles/custom/matrix-ldap-registration-proxy/tasks/setup_install.yml b/roles/custom/matrix-ldap-registration-proxy/tasks/setup_install.yml index e068a629b..779ff5cdb 100644 --- a/roles/custom/matrix-ldap-registration-proxy/tasks/setup_install.yml +++ b/roles/custom/matrix-ldap-registration-proxy/tasks/setup_install.yml @@ -13,7 +13,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_ldap_registration_proxy_config_path }}", when: true} @@ -27,7 +27,7 @@ version: "{{ matrix_ldap_registration_proxy_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_ldap_registration_proxy_git_pull_results - name: Ensure matrix_ldap_registration_proxy Docker image is built @@ -46,7 +46,7 @@ src: "{{ role_path }}/templates/ldap-registration-proxy.env.j2" dest: "{{ matrix_ldap_registration_proxy_config_path }}/ldap-registration-proxy.env" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-ldap-registration-proxy support files installed @@ -54,7 +54,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_ldap_registration_proxy_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-livekit-jwt-service/tasks/install.yml b/roles/custom/matrix-livekit-jwt-service/tasks/install.yml index 9193d6679..da8a0a970 100644 --- a/roles/custom/matrix-livekit-jwt-service/tasks/install.yml +++ b/roles/custom/matrix-livekit-jwt-service/tasks/install.yml @@ -11,7 +11,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - path: "{{ matrix_livekit_jwt_service_base_path }}" @@ -21,7 +21,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_livekit_jwt_service_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - env @@ -48,7 +48,7 @@ dest: "{{ matrix_livekit_jwt_service_container_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_livekit_jwt_service_git_pull_results - name: Ensure LiveKit JWT Service container image is built diff --git a/roles/custom/matrix-ma1sd/tasks/setup_install.yml b/roles/custom/matrix-ma1sd/tasks/setup_install.yml index 93aa2f14e..67f378d71 100644 --- a/roles/custom/matrix-ma1sd/tasks/setup_install.yml +++ b/roles/custom/matrix-ma1sd/tasks/setup_install.yml @@ -19,7 +19,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_ma1sd_config_path }}", when: true} @@ -78,7 +78,7 @@ version: "{{ matrix_ma1sd_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_ma1sd_git_pull_results - name: Ensure ma1sd container image is built @@ -95,7 +95,7 @@ content: "{{ matrix_ma1sd_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_ma1sd_config_path }}/ma1sd.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure custom view templates are installed, if any @@ -103,7 +103,7 @@ content: "{{ item.value }}" dest: "{{ matrix_ma1sd_config_path }}/{{ item.location }}" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {value: "{{ matrix_ma1sd_view_session_custom_onTokenSubmit_success_template }}", location: 'tokenSubmitSuccess.html'} @@ -115,7 +115,7 @@ content: "{{ item.value }}" dest: "{{ matrix_ma1sd_config_path }}/{{ item.location }}" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {value: "{{ matrix_ma1sd_threepid_medium_email_custom_invite_template }}", location: 'invite-template.eml'} @@ -141,7 +141,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_ma1sd_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-media-repo/tasks/setup_install.yml b/roles/custom/matrix-media-repo/tasks/setup_install.yml index 525df257f..488830626 100755 --- a/roles/custom/matrix-media-repo/tasks/setup_install.yml +++ b/roles/custom/matrix-media-repo/tasks/setup_install.yml @@ -12,7 +12,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - path: "{{ matrix_media_repo_base_path }}" @@ -30,7 +30,7 @@ src: "{{ role_path }}/templates/media-repo/{{ item }}.j2" dest: "{{ matrix_media_repo_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - env @@ -41,7 +41,7 @@ src: "{{ role_path }}/templates/media-repo/media-repo.yaml.j2" dest: "{{ matrix_media_repo_config_path }}/media-repo.yaml" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure media-repo Docker image is pulled @@ -65,7 +65,7 @@ version: "{{ matrix_media_repo_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_media_repo_git_pull_results - name: Check if media-repo Docker image exists @@ -128,7 +128,7 @@ src: "{{ matrix_media_repo_homeserver_signing_key }}" dest: "{{ matrix_media_repo_homeserver_signing_key }}.{{ matrix_homeserver_implementation }}.backup" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Replace homeserver signing key with merged signing key diff --git a/roles/custom/matrix-pantalaimon/tasks/install.yml b/roles/custom/matrix-pantalaimon/tasks/install.yml index 256aa2f83..5cfe1cd3b 100644 --- a/roles/custom/matrix-pantalaimon/tasks/install.yml +++ b/roles/custom/matrix-pantalaimon/tasks/install.yml @@ -10,7 +10,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_pantalaimon_base_path }}", when: true} @@ -23,7 +23,7 @@ content: "{{ matrix_pantalaimon_configuration }}" dest: "{{ matrix_pantalaimon_data_path }}/pantalaimon.conf" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure pantalaimon container image is pulled @@ -45,7 +45,7 @@ dest: "{{ matrix_pantalaimon_container_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_pantalaimon_git_pull_results when: "matrix_pantalaimon_container_image_self_build | bool" diff --git a/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/setup_install.yml b/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/setup_install.yml index 702c65e3a..f46a685c7 100644 --- a/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/setup_install.yml +++ b/roles/custom/matrix-prometheus-nginxlog-exporter/tasks/setup_install.yml @@ -22,7 +22,7 @@ path: "{{ item }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - "{{ matrix_prometheus_nginxlog_exporter_base_path }}" @@ -33,7 +33,7 @@ src: "{{ role_path }}/templates/prometheus-nginxlog-exporter.yaml.j2" dest: "{{ matrix_prometheus_nginxlog_exporter_config_path }}/prometheus-nginxlog-exporter.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure prometheus-nginxlog-exporter support files installed @@ -41,7 +41,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_prometheus_nginxlog_exporter_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-rageshake/tasks/install.yml b/roles/custom/matrix-rageshake/tasks/install.yml index 796adf852..6a7b0e72c 100644 --- a/roles/custom/matrix-rageshake/tasks/install.yml +++ b/roles/custom/matrix-rageshake/tasks/install.yml @@ -12,7 +12,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - path: "{{ matrix_rageshake_config_path }}" @@ -27,7 +27,7 @@ ansible.builtin.copy: content: "{{ matrix_rageshake_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_rageshake_config_path }}/config.yaml" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 @@ -36,7 +36,7 @@ src: "{{ role_path }}/templates/labels.j2" dest: "{{ matrix_rageshake_base_path }}/labels" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure rageshake image is pulled @@ -58,7 +58,7 @@ dest: "{{ matrix_rageshake_container_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_rageshake_git_pull_results when: "matrix_rageshake_container_image_self_build | bool" diff --git a/roles/custom/matrix-registration/tasks/setup_install.yml b/roles/custom/matrix-registration/tasks/setup_install.yml index 9a97c1704..95781a634 100644 --- a/roles/custom/matrix-registration/tasks/setup_install.yml +++ b/roles/custom/matrix-registration/tasks/setup_install.yml @@ -47,7 +47,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_registration_base_path }}", when: true} @@ -75,7 +75,7 @@ version: "{{ matrix_registration_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_registration_git_pull_results when: "matrix_registration_container_image_self_build | bool" @@ -104,7 +104,7 @@ content: "{{ matrix_registration_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_registration_config_path }}/config.yaml" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-registration support files installed @@ -112,7 +112,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_registration_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - labels diff --git a/roles/custom/matrix-sliding-sync/tasks/install.yml b/roles/custom/matrix-sliding-sync/tasks/install.yml index 50128b583..d23d2cdf7 100644 --- a/roles/custom/matrix-sliding-sync/tasks/install.yml +++ b/roles/custom/matrix-sliding-sync/tasks/install.yml @@ -10,7 +10,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - path: "{{ matrix_sliding_sync_base_path }}" @@ -24,7 +24,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_sliding_sync_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - env @@ -51,7 +51,7 @@ dest: "{{ matrix_sliding_sync_container_src_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_sliding_sync_git_pull_results - name: Ensure matrix-sliding-sync container image is built diff --git a/roles/custom/matrix-static-files/tasks/install.yml b/roles/custom/matrix-static-files/tasks/install.yml index dd467a38d..c8a752b4c 100644 --- a/roles/custom/matrix-static-files/tasks/install.yml +++ b/roles/custom/matrix-static-files/tasks/install.yml @@ -10,7 +10,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_static_files_base_path }}", when: true} @@ -30,7 +30,7 @@ ansible.builtin.template: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0644 with_items: @@ -48,7 +48,7 @@ content: "{{ item.content }}" dest: "{{ item.dest }}" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" when: item.when | bool with_items: diff --git a/roles/custom/matrix-sygnal/tasks/install.yml b/roles/custom/matrix-sygnal/tasks/install.yml index af6b88fe9..8ae6c875a 100644 --- a/roles/custom/matrix-sygnal/tasks/install.yml +++ b/roles/custom/matrix-sygnal/tasks/install.yml @@ -14,7 +14,7 @@ path: "{{ item }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - "{{ matrix_sygnal_base_path }}" @@ -26,7 +26,7 @@ content: "{{ matrix_sygnal_configuration | to_nice_yaml(indent=2, width=999999) }}" dest: "{{ matrix_sygnal_config_path }}/sygnal.yaml" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Sygnal labels installed @@ -34,7 +34,7 @@ src: "{{ role_path }}/templates/labels.j2" dest: "{{ matrix_sygnal_base_path }}/labels" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure Sygnal image is pulled diff --git a/roles/custom/matrix-synapse-admin/tasks/setup_install.yml b/roles/custom/matrix-synapse-admin/tasks/setup_install.yml index 1c3fb8673..adaf66ea1 100644 --- a/roles/custom/matrix-synapse-admin/tasks/setup_install.yml +++ b/roles/custom/matrix-synapse-admin/tasks/setup_install.yml @@ -16,7 +16,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_synapse_admin_base_path }}", when: true} @@ -28,7 +28,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/labels.j2" dest: "{{ matrix_synapse_admin_base_path }}/labels" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0640 @@ -37,7 +37,7 @@ content: "{{ matrix_synapse_admin_configuration | to_nice_json }}" dest: "{{ matrix_synapse_admin_config_path }}/config.json" mode: 0644 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure matrix-synapse-admin image is pulled @@ -59,7 +59,7 @@ version: "{{ matrix_synapse_admin_docker_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_synapse_admin_git_pull_results when: matrix_synapse_admin_container_image_self_build | bool diff --git a/roles/custom/matrix-synapse-auto-compressor/tasks/install.yml b/roles/custom/matrix-synapse-auto-compressor/tasks/install.yml index 3e69d9f5d..6cd272c9e 100644 --- a/roles/custom/matrix-synapse-auto-compressor/tasks/install.yml +++ b/roles/custom/matrix-synapse-auto-compressor/tasks/install.yml @@ -11,7 +11,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" when: item.when | bool with_items: @@ -25,7 +25,7 @@ src: "{{ role_path }}/templates/env.j2" dest: "{{ matrix_synapse_auto_compressor_base_path }}/env" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure synapse-auto-compressor workaround script is installed @@ -33,7 +33,7 @@ src: "{{ role_path }}/templates/matrix-synapse-auto-compressor-fix.sh.j2" dest: "{{ matrix_synapse_auto_compressor_base_path }}/matrix-synapse-auto-compressor-fix.sh" mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" - name: Ensure synapse-auto-compressor image is pulled @@ -58,7 +58,7 @@ dest: "{{ matrix_synapse_auto_compressor_container_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_synapse_auto_compressor_git_pull_results - name: Check if synapse-auto-compressor image exists diff --git a/roles/custom/matrix-synapse-reverse-proxy-companion/tasks/setup_install.yml b/roles/custom/matrix-synapse-reverse-proxy-companion/tasks/setup_install.yml index 34ab589d8..67180bf37 100644 --- a/roles/custom/matrix-synapse-reverse-proxy-companion/tasks/setup_install.yml +++ b/roles/custom/matrix-synapse-reverse-proxy-companion/tasks/setup_install.yml @@ -10,7 +10,7 @@ path: "{{ item }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - "{{ matrix_synapse_reverse_proxy_companion_base_path }}" @@ -20,7 +20,7 @@ ansible.builtin.template: src: "{{ item.src }}" dest: "{{ item.dest }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0644 with_items: diff --git a/roles/custom/matrix-synapse-usage-exporter/tasks/setup_install.yml b/roles/custom/matrix-synapse-usage-exporter/tasks/setup_install.yml index 591e377e3..a2151bf81 100644 --- a/roles/custom/matrix-synapse-usage-exporter/tasks/setup_install.yml +++ b/roles/custom/matrix-synapse-usage-exporter/tasks/setup_install.yml @@ -10,7 +10,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - path: "{{ matrix_synapse_usage_exporter_base_path }}" @@ -24,7 +24,7 @@ src: "{{ role_path }}/templates/{{ item }}.j2" dest: "{{ matrix_synapse_usage_exporter_base_path }}/{{ item }}" mode: 0640 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - env @@ -51,7 +51,7 @@ version: "{{ matrix_synapse_usage_exporter_container_image.split(':')[1] }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_synapse_usage_exporter_git_pull_results - name: Check if synapse-usage-exporter Docker image exists diff --git a/roles/custom/matrix-user-verification-service/tasks/setup_install.yml b/roles/custom/matrix-user-verification-service/tasks/setup_install.yml index a539168b5..b04f299cc 100644 --- a/roles/custom/matrix-user-verification-service/tasks/setup_install.yml +++ b/roles/custom/matrix-user-verification-service/tasks/setup_install.yml @@ -11,7 +11,7 @@ path: "{{ item.path }}" state: directory mode: 0750 - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" with_items: - {path: "{{ matrix_user_verification_service_config_path }}", when: true} @@ -37,7 +37,7 @@ version: "{{ matrix_user_verification_service_container_image_self_build_branch }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ matrix_user_name }}" register: matrix_user_verification_service_git_pull_results when: "matrix_user_verification_service_container_image_self_build | bool" @@ -57,7 +57,7 @@ ansible.builtin.template: src: "{{ role_path }}/templates/.env.j2" dest: "{{ matrix_user_verification_service_config_env_file }}" - owner: "{{ matrix_user_username }}" + owner: "{{ matrix_user_name }}" group: "{{ matrix_user_groupname }}" mode: 0644