From fce84a2b3c687038095eb7407c96418f1af3968f Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 9 Jan 2024 09:54:42 +0200 Subject: [PATCH] Rename variable for consistency (matrix_homeserver_proxy_ident -> matrix_homeserver_proxy_identifier) --- group_vars/matrix_servers | 4 ++-- roles/custom/matrix-homeserver-proxy/defaults/main.yml | 4 ++-- roles/custom/matrix-homeserver-proxy/tasks/install.yml | 2 +- roles/custom/matrix-homeserver-proxy/tasks/uninstall.yml | 6 +++--- roles/custom/matrix-homeserver-proxy/vars/main.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 1d717eb26..d5ec0dabd 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -191,7 +191,7 @@ matrix_homeserver_app_service_config_files_auto: | matrix_addons_homeserver_container_network: "{{ matrix_homeserver_proxy_container_network if matrix_homeserver_proxy_enabled else matrix_homeserver_container_network }}" matrix_addons_homeserver_client_api_url: "{{ matrix_homeserver_proxy_client_api_url if matrix_homeserver_proxy_enabled else matrix_homeserver_container_url }}" -matrix_addons_homeserver_systemd_services_list: "{{ ([matrix_homeserver_proxy_ident + '.service']) if matrix_homeserver_proxy_enabled else matrix_homeserver_systemd_services_list }}" +matrix_addons_homeserver_systemd_services_list: "{{ ([matrix_homeserver_proxy_identifier + '.service']) if matrix_homeserver_proxy_enabled else matrix_homeserver_systemd_services_list }}" # Starting from version `0.6.0` conduit natively supports some sync v3 (sliding-sync) features. matrix_homeserver_sliding_sync_url: "{{ matrix_sliding_sync_base_url if matrix_sliding_sync_enabled else (matrix_homeserver_url if matrix_homeserver_implementation in ['conduit'] else '') }}" @@ -361,7 +361,7 @@ devture_systemd_service_manager_services_list_auto: | + (matrix_ssl_renewal_systemd_units_list | selectattr('applicable') | selectattr('enableable') | list ) + - ([{'name': (matrix_homeserver_proxy_ident + '.service'), 'priority': 3000, 'groups': ['matrix', 'reverse-proxies']}] if matrix_homeserver_proxy_enabled else []) + ([{'name': (matrix_homeserver_proxy_identifier + '.service'), 'priority': 3000, 'groups': ['matrix', 'reverse-proxies']}] if matrix_homeserver_proxy_enabled else []) + ([{'name': (ntfy_identifier + '.service'), 'priority': 800, 'groups': ['matrix', 'ntfy']}] if ntfy_enabled else []) + diff --git a/roles/custom/matrix-homeserver-proxy/defaults/main.yml b/roles/custom/matrix-homeserver-proxy/defaults/main.yml index 7f974c2bb..d1003db2a 100644 --- a/roles/custom/matrix-homeserver-proxy/defaults/main.yml +++ b/roles/custom/matrix-homeserver-proxy/defaults/main.yml @@ -31,7 +31,7 @@ matrix_homeserver_proxy_enabled: true -matrix_homeserver_proxy_ident: matrix-homeserver-proxy +matrix_homeserver_proxy_identifier: matrix-homeserver-proxy # renovate: datasource=docker depName=nginx matrix_homeserver_proxy_version: 1.25.3-alpine @@ -112,7 +112,7 @@ matrix_homeserver_proxy_send_timeout: 60 # We point it to the internal Docker resolver, which likely delegates to nameservers defined in `/etc/resolv.conf`. matrix_homeserver_proxy_http_level_resolver: 127.0.0.11 -matrix_homeserver_proxy_hostname: "{{ matrix_homeserver_proxy_ident }}" +matrix_homeserver_proxy_hostname: "{{ matrix_homeserver_proxy_identifier }}" # matrix_homeserver_proxy_client_api_addr specifies the address where the Client-Server API is matrix_homeserver_proxy_client_api_addr: '' diff --git a/roles/custom/matrix-homeserver-proxy/tasks/install.yml b/roles/custom/matrix-homeserver-proxy/tasks/install.yml index 0171f888f..0706a5d78 100644 --- a/roles/custom/matrix-homeserver-proxy/tasks/install.yml +++ b/roles/custom/matrix-homeserver-proxy/tasks/install.yml @@ -45,5 +45,5 @@ - name: Ensure Matrix Homeserver Proxy systemd service is installed ansible.builtin.template: src: "{{ role_path }}/templates/systemd/matrix-homeserver-proxy.service.j2" - dest: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_homeserver_proxy_ident }}.service" + dest: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_homeserver_proxy_identifier }}.service" mode: 0644 diff --git a/roles/custom/matrix-homeserver-proxy/tasks/uninstall.yml b/roles/custom/matrix-homeserver-proxy/tasks/uninstall.yml index 01425f2c1..0cc46d15a 100644 --- a/roles/custom/matrix-homeserver-proxy/tasks/uninstall.yml +++ b/roles/custom/matrix-homeserver-proxy/tasks/uninstall.yml @@ -2,21 +2,21 @@ - name: Check existence of Matrix Homeserver Proxy systemd service ansible.builtin.stat: - path: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_homeserver_proxy_ident }}.service" + path: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_homeserver_proxy_identifier }}.service" register: matrix_homeserver_proxy_service_stat - when: matrix_homeserver_proxy_service_stat.stat.exists | bool block: - name: Ensure Matrix Homeserver Proxy systemd service is stopped ansible.builtin.service: - name: "{{ matrix_homeserver_proxy_ident }}" + name: "{{ matrix_homeserver_proxy_identifier }}" state: stopped enabled: false daemon_reload: true - name: Ensure Matrix Homeserver Proxy systemd service doesn't exist ansible.builtin.file: - path: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_homeserver_proxy_ident }}.service" + path: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_homeserver_proxy_identifier }}.service" state: absent - name: Ensure Matrix Homeserver Proxy directory is deleted diff --git a/roles/custom/matrix-homeserver-proxy/vars/main.yml b/roles/custom/matrix-homeserver-proxy/vars/main.yml index 71e652c1f..f9ffe6795 100644 --- a/roles/custom/matrix-homeserver-proxy/vars/main.yml +++ b/roles/custom/matrix-homeserver-proxy/vars/main.yml @@ -1,4 +1,4 @@ --- -matrix_homeserver_proxy_client_api_url: "http://{{ matrix_homeserver_proxy_ident }}:8008" +matrix_homeserver_proxy_client_api_url: "http://{{ matrix_homeserver_proxy_identifier }}:8008" -matrix_homeserver_proxy_federation_api_url: "http://{{ matrix_homeserver_proxy_ident }}:8048" +matrix_homeserver_proxy_federation_api_url: "http://{{ matrix_homeserver_proxy_identifier }}:8048"