mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-11-06 10:47:32 +01:00
Rename variable for consistency (matrix_homeserver_proxy_ident -> matrix_homeserver_proxy_identifier)
This commit is contained in:
parent
2f27a57d00
commit
fce84a2b3c
@ -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_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_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.
|
# 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 '') }}"
|
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 )
|
(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 [])
|
([{'name': (ntfy_identifier + '.service'), 'priority': 800, 'groups': ['matrix', 'ntfy']}] if ntfy_enabled else [])
|
||||||
+
|
+
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
matrix_homeserver_proxy_enabled: true
|
matrix_homeserver_proxy_enabled: true
|
||||||
|
|
||||||
matrix_homeserver_proxy_ident: matrix-homeserver-proxy
|
matrix_homeserver_proxy_identifier: matrix-homeserver-proxy
|
||||||
|
|
||||||
# renovate: datasource=docker depName=nginx
|
# renovate: datasource=docker depName=nginx
|
||||||
matrix_homeserver_proxy_version: 1.25.3-alpine
|
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`.
|
# 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_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 specifies the address where the Client-Server API is
|
||||||
matrix_homeserver_proxy_client_api_addr: ''
|
matrix_homeserver_proxy_client_api_addr: ''
|
||||||
|
@ -45,5 +45,5 @@
|
|||||||
- name: Ensure Matrix Homeserver Proxy systemd service is installed
|
- name: Ensure Matrix Homeserver Proxy systemd service is installed
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "{{ role_path }}/templates/systemd/matrix-homeserver-proxy.service.j2"
|
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
|
mode: 0644
|
||||||
|
@ -2,21 +2,21 @@
|
|||||||
|
|
||||||
- name: Check existence of Matrix Homeserver Proxy systemd service
|
- name: Check existence of Matrix Homeserver Proxy systemd service
|
||||||
ansible.builtin.stat:
|
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
|
register: matrix_homeserver_proxy_service_stat
|
||||||
|
|
||||||
- when: matrix_homeserver_proxy_service_stat.stat.exists | bool
|
- when: matrix_homeserver_proxy_service_stat.stat.exists | bool
|
||||||
block:
|
block:
|
||||||
- name: Ensure Matrix Homeserver Proxy systemd service is stopped
|
- name: Ensure Matrix Homeserver Proxy systemd service is stopped
|
||||||
ansible.builtin.service:
|
ansible.builtin.service:
|
||||||
name: "{{ matrix_homeserver_proxy_ident }}"
|
name: "{{ matrix_homeserver_proxy_identifier }}"
|
||||||
state: stopped
|
state: stopped
|
||||||
enabled: false
|
enabled: false
|
||||||
daemon_reload: true
|
daemon_reload: true
|
||||||
|
|
||||||
- name: Ensure Matrix Homeserver Proxy systemd service doesn't exist
|
- name: Ensure Matrix Homeserver Proxy systemd service doesn't exist
|
||||||
ansible.builtin.file:
|
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
|
state: absent
|
||||||
|
|
||||||
- name: Ensure Matrix Homeserver Proxy directory is deleted
|
- name: Ensure Matrix Homeserver Proxy directory is deleted
|
||||||
|
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user