Use fully-qualified module names for builtin Ansible modules
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1939
This commit is contained in:
@ -2,16 +2,16 @@
|
||||
# See https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070
|
||||
# and https://github.com/spantaleev/matrix-docker-ansible-deploy/commit/1ab507349c752042d26def3e95884f6df8886b74#commitcomment-51108407
|
||||
- name: Fail if trying to self-build on Ansible < 2.8
|
||||
fail:
|
||||
ansible.builtin.fail:
|
||||
msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
|
||||
when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mautrix_googlechat_container_image_self_build and matrix_mautrix_googlechat_enabled"
|
||||
|
||||
- set_fact:
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-googlechat.service'] }}"
|
||||
when: matrix_mautrix_googlechat_enabled|bool
|
||||
|
||||
# If the matrix-synapse role is not used, these variables may not exist.
|
||||
- set_fact:
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_synapse_container_extra_arguments: >
|
||||
{{
|
||||
matrix_synapse_container_extra_arguments|default([])
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
- block:
|
||||
- name: Fail if matrix-nginx-proxy role already executed
|
||||
fail:
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
Trying to append Mautrix googlechat's reverse-proxying configuration to matrix-nginx-proxy,
|
||||
but it's pointless since the matrix-nginx-proxy role had already executed.
|
||||
@ -38,7 +38,7 @@
|
||||
when: matrix_nginx_proxy_role_executed|default(False)|bool
|
||||
|
||||
- name: Generate Mautrix googlechat proxying configuration for matrix-nginx-proxy
|
||||
set_fact:
|
||||
ansible.builtin.set_fact:
|
||||
matrix_mautrix_googlechat_matrix_nginx_proxy_configuration: |
|
||||
location {{ matrix_mautrix_googlechat_public_endpoint }} {
|
||||
{% if matrix_nginx_proxy_enabled|default(False) %}
|
||||
@ -52,7 +52,7 @@
|
||||
{% endif %}
|
||||
}
|
||||
- name: Register Mautrix googlechat proxying configuration with matrix-nginx-proxy
|
||||
set_fact:
|
||||
ansible.builtin.set_fact:
|
||||
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
|
||||
{{
|
||||
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks|default([])
|
||||
@ -64,7 +64,7 @@
|
||||
when: matrix_mautrix_googlechat_enabled|bool
|
||||
|
||||
- name: Warn about reverse-proxying if matrix-nginx-proxy not used
|
||||
debug:
|
||||
ansible.builtin.debug:
|
||||
msg: >-
|
||||
NOTE: You've enabled the Mautrix googlechat bridge but are not using the matrix-nginx-proxy
|
||||
reverse proxy.
|
||||
|
@ -3,12 +3,12 @@
|
||||
# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
|
||||
# We don't want to fail in such cases.
|
||||
- name: Fail if matrix-synapse role already executed
|
||||
fail:
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
The matrix-bridge-mautrix-googlechat role needs to execute before the matrix-synapse role.
|
||||
when: "matrix_synapse_role_executed|default(False)"
|
||||
|
||||
- set_fact:
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_mautrix_googlechat_requires_restart: false
|
||||
|
||||
- block:
|
||||
@ -18,7 +18,7 @@
|
||||
register: matrix_mautrix_googlechat_sqlite_database_path_local_stat_result
|
||||
|
||||
- block:
|
||||
- set_fact:
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_postgres_db_migration_request:
|
||||
src: "{{ matrix_mautrix_googlechat_sqlite_database_path_local }}"
|
||||
dst: "{{ matrix_mautrix_googlechat_database_connection_string }}"
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
- import_tasks: "{{ role_path }}/../matrix-postgres/tasks/util/migrate_db_to_postgres.yml"
|
||||
|
||||
- set_fact:
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_mautrix_googlechat_requires_restart: true
|
||||
when: "matrix_mautrix_googlechat_sqlite_database_path_local_stat_result.stat.exists|bool"
|
||||
when: "matrix_mautrix_googlechat_database_engine == 'postgres'"
|
||||
@ -47,7 +47,7 @@
|
||||
until: result is not failed
|
||||
|
||||
- name: Ensure Mautrix googlechat paths exist
|
||||
file:
|
||||
ansible.builtin.file:
|
||||
path: "{{ item.path }}"
|
||||
state: directory
|
||||
mode: 0750
|
||||
@ -61,7 +61,7 @@
|
||||
when: "item.when|bool"
|
||||
|
||||
- name: Ensure Mautrix Hangots repository is present on self build
|
||||
git:
|
||||
ansible.builtin.git:
|
||||
repo: "{{ matrix_mautrix_googlechat_container_image_self_build_repo }}"
|
||||
dest: "{{ matrix_mautrix_googlechat_docker_src_files_path }}"
|
||||
force: "yes"
|
||||
@ -88,7 +88,7 @@
|
||||
register: matrix_mautrix_googlechat_stat_database
|
||||
|
||||
- name: (Data relocation) Ensure matrix-mautrix-googlechat.service is stopped
|
||||
service:
|
||||
ansible.builtin.service:
|
||||
name: matrix-mautrix-googlechat
|
||||
state: stopped
|
||||
enabled: false
|
||||
@ -97,11 +97,11 @@
|
||||
when: "matrix_mautrix_googlechat_stat_database.stat.exists"
|
||||
|
||||
- name: (Data relocation) Move mautrix-googlechat database file to ./data directory
|
||||
command: "mv {{ matrix_mautrix_googlechat_base_path }}/mautrix-googlechat.db {{ matrix_mautrix_googlechat_data_path }}/mautrix-googlechat.db"
|
||||
ansible.builtin.command: "mv {{ matrix_mautrix_googlechat_base_path }}/mautrix-googlechat.db {{ matrix_mautrix_googlechat_data_path }}/mautrix-googlechat.db"
|
||||
when: "matrix_mautrix_googlechat_stat_database.stat.exists"
|
||||
|
||||
- name: Ensure mautrix-googlechat config.yaml installed
|
||||
copy:
|
||||
ansible.builtin.copy:
|
||||
content: "{{ matrix_mautrix_googlechat_configuration|to_nice_yaml(indent=2, width=999999) }}"
|
||||
dest: "{{ matrix_mautrix_googlechat_config_path }}/config.yaml"
|
||||
mode: 0644
|
||||
@ -109,7 +109,7 @@
|
||||
group: "{{ matrix_user_groupname }}"
|
||||
|
||||
- name: Ensure mautrix-googlechat registration.yaml installed
|
||||
copy:
|
||||
ansible.builtin.copy:
|
||||
content: "{{ matrix_mautrix_googlechat_registration|to_nice_yaml(indent=2, width=999999) }}"
|
||||
dest: "{{ matrix_mautrix_googlechat_config_path }}/registration.yaml"
|
||||
mode: 0644
|
||||
@ -117,19 +117,19 @@
|
||||
group: "{{ matrix_user_groupname }}"
|
||||
|
||||
- name: Ensure matrix-mautrix-googlechat.service installed
|
||||
template:
|
||||
ansible.builtin.template:
|
||||
src: "{{ role_path }}/templates/systemd/matrix-mautrix-googlechat.service.j2"
|
||||
dest: "{{ matrix_systemd_path }}/matrix-mautrix-googlechat.service"
|
||||
mode: 0644
|
||||
register: matrix_mautrix_googlechat_systemd_service_result
|
||||
|
||||
- name: Ensure systemd reloaded after matrix-mautrix-googlechat.service installation
|
||||
service:
|
||||
ansible.builtin.service:
|
||||
daemon_reload: true
|
||||
when: "matrix_mautrix_googlechat_systemd_service_result.changed"
|
||||
|
||||
- name: Ensure matrix-mautrix-googlechat.service restarted, if necessary
|
||||
service:
|
||||
ansible.builtin.service:
|
||||
name: "matrix-mautrix-googlechat.service"
|
||||
state: restarted
|
||||
when: "matrix_mautrix_googlechat_requires_restart|bool"
|
||||
|
@ -6,7 +6,7 @@
|
||||
register: matrix_mautrix_googlechat_service_stat
|
||||
|
||||
- name: Ensure matrix-mautrix-googlechat is stopped
|
||||
service:
|
||||
ansible.builtin.service:
|
||||
name: matrix-mautrix-googlechat
|
||||
state: stopped
|
||||
enabled: false
|
||||
@ -14,12 +14,12 @@
|
||||
when: "matrix_mautrix_googlechat_service_stat.stat.exists"
|
||||
|
||||
- name: Ensure matrix-mautrix-googlechat.service doesn't exist
|
||||
file:
|
||||
ansible.builtin.file:
|
||||
path: "{{ matrix_systemd_path }}/matrix-mautrix-googlechat.service"
|
||||
state: absent
|
||||
when: "matrix_mautrix_googlechat_service_stat.stat.exists"
|
||||
|
||||
- name: Ensure systemd reloaded after matrix-mautrix-googlechat.service removal
|
||||
service:
|
||||
ansible.builtin.service:
|
||||
daemon_reload: true
|
||||
when: "matrix_mautrix_googlechat_service_stat.stat.exists"
|
||||
|
@ -1,7 +1,7 @@
|
||||
---
|
||||
|
||||
- name: Fail if required settings not defined
|
||||
fail:
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
You need to define a required configuration setting (`{{ item }}`).
|
||||
when: "vars[item] == ''"
|
||||
@ -9,6 +9,6 @@
|
||||
- "matrix_mautrix_googlechat_public_endpoint"
|
||||
- "matrix_mautrix_googlechat_appservice_token"
|
||||
- "matrix_mautrix_googlechat_homeserver_token"
|
||||
- debug:
|
||||
- ansible.builtin.debug:
|
||||
msg:
|
||||
- '`matrix_mautrix_googlechat_homeserver_domain` == {{ matrix_mautrix_googlechat_homeserver_domain }}'
|
||||
|
Reference in New Issue
Block a user