More ansible-lint fixes
This commit is contained in:
roles
matrix-aux
matrix-backup-borg
matrix-base
tasks
matrix-bot-buscarron
matrix-bot-go-neb
matrix-bot-honoroit
matrix-bot-matrix-registration-bot
matrix-bot-matrix-reminder-bot
matrix-bot-mjolnir
matrix-bridge-appservice-discord
matrix-bridge-appservice-irc
defaults
tasks
matrix-bridge-appservice-slack
defaults
tasks
matrix-bridge-appservice-webhooks
matrix-bridge-beeper-linkedin
matrix-bridge-go-skype-bridge
matrix-bridge-heisenbridge
matrix-bridge-hookshot
matrix-bridge-mautrix-facebook
matrix-bridge-mautrix-googlechat
matrix-bridge-mautrix-hangouts
matrix-bridge-mautrix-instagram
matrix-bridge-mautrix-signal
matrix-bridge-mautrix-telegram
matrix-bridge-mautrix-twitter
matrix-bridge-mautrix-whatsapp
matrix-bridge-mx-puppet-discord
matrix-bridge-mx-puppet-groupme
matrix-bridge-mx-puppet-instagram
matrix-bridge-mx-puppet-slack
matrix-bridge-mx-puppet-steam
matrix-bridge-mx-puppet-twitter
matrix-bridge-sms
matrix-client-cinny
matrix-client-element
matrix-client-hydrogen
matrix-common-after
matrix-corporal
matrix-coturn
matrix-dendrite
defaults
tasks
vars
matrix-dimension
matrix-dynamic-dns
matrix-email2matrix
matrix-etherpad
matrix-grafana
matrix-jitsi
tasks
matrix-ma1sd
defaults
tasks
vars
matrix-mailer
matrix-nginx-proxy
tasks
init.ymlmain.ymlself_check_well_known.ymlsetup_nginx_proxy.yml
ssl
main.ymlsetup_ssl_lets_encrypt.ymlsetup_ssl_lets_encrypt_obtain_for_domain.ymlsetup_ssl_manually_managed.ymlsetup_ssl_manually_managed_verify_for_domain.ymlsetup_ssl_self_signed.ymlsetup_ssl_self_signed_obtain_for_domain.yml
validate_config.ymlvars
matrix-ntfy
matrix-postgres-backup
matrix-postgres
defaults
tasks
matrix-prometheus-node-exporter
matrix-prometheus-postgres-exporter
matrix-prometheus
matrix-redis
matrix-registration
defaults
tasks
matrix-sygnal
matrix-synapse-admin
matrix-synapse
defaults
tasks
ext
encryption-disabler
ldap-auth
mjolnir-antispam
rest-auth
setup.ymlshared-secret-auth
synapse-simple-antispam
goofys
import_media_store.ymlinit.ymlmain.ymlregister_user.ymlrust-synapse-compress-state
self_check_client_api.ymlself_check_federation_api.ymlsetup_synapse.ymlsynapse
update_user_password.ymlvars
@ -2,4 +2,4 @@
|
||||
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-postgres-backup.service'] }}"
|
||||
when: matrix_postgres_backup_enabled|bool
|
||||
when: matrix_postgres_backup_enabled | bool
|
||||
|
@ -1,17 +1,17 @@
|
||||
---
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/init.yml"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/init.yml"
|
||||
tags:
|
||||
- always
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/validate_config.yml"
|
||||
when: "run_setup|bool and matrix_postgres_backup_enabled|bool"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
|
||||
when: "run_setup | bool and matrix_postgres_backup_enabled | bool"
|
||||
tags:
|
||||
- setup-all
|
||||
- setup-postgres-backup
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/setup_postgres_backup.yml"
|
||||
when: run_setup|bool
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_postgres_backup.yml"
|
||||
when: run_setup | bool
|
||||
tags:
|
||||
- setup-all
|
||||
- setup-postgres-backup
|
||||
|
@ -3,16 +3,16 @@
|
||||
#
|
||||
# Tasks related to setting up an internal postgres server
|
||||
#
|
||||
- import_tasks: "{{ role_path }}/tasks/util/detect_existing_postgres_version.yml"
|
||||
when: 'matrix_postgres_backup_enabled|bool and matrix_postgres_backup_postgres_data_path != ""'
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/util/detect_existing_postgres_version.yml"
|
||||
when: 'matrix_postgres_backup_enabled | bool and matrix_postgres_backup_postgres_data_path != ""'
|
||||
|
||||
# If we have found an existing version (installed from before), we use its corresponding Docker image.
|
||||
# If not, we install using the latest Postgres.
|
||||
#
|
||||
# Upgrading is supposed to be performed separately and explicitly (see `upgrade_postgres.yml`).
|
||||
- ansible.builtin.set_fact:
|
||||
matrix_postgres_backup_docker_image_to_use: "{{ matrix_postgres_backup_docker_image_latest if matrix_postgres_backup_detected_version_corresponding_docker_image|default('') == '' else matrix_postgres_backup_detected_version_corresponding_docker_image }}"
|
||||
when: matrix_postgres_backup_enabled|bool
|
||||
matrix_postgres_backup_docker_image_to_use: "{{ matrix_postgres_backup_docker_image_latest if matrix_postgres_backup_detected_version_corresponding_docker_image | default('') == '' else matrix_postgres_backup_detected_version_corresponding_docker_image }}"
|
||||
when: matrix_postgres_backup_enabled | bool
|
||||
|
||||
- name: Ensure postgres backup Docker image is pulled
|
||||
docker_image:
|
||||
@ -20,7 +20,7 @@
|
||||
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
||||
force_source: "{{ matrix_postgres_backup_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
|
||||
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_postgres_backup_docker_image_force_pull }}"
|
||||
when: matrix_postgres_backup_enabled|bool
|
||||
when: matrix_postgres_backup_enabled | bool
|
||||
register: result
|
||||
retries: "{{ matrix_container_retries_count }}"
|
||||
delay: "{{ matrix_container_retries_delay }}"
|
||||
@ -35,7 +35,7 @@
|
||||
group: "{{ matrix_user_groupname }}"
|
||||
with_items:
|
||||
- "{{ matrix_postgres_backup_path }}"
|
||||
when: matrix_postgres_backup_enabled|bool
|
||||
when: matrix_postgres_backup_enabled | bool
|
||||
|
||||
- name: Ensure Postgres environment variables file created
|
||||
ansible.builtin.template:
|
||||
@ -46,7 +46,7 @@
|
||||
mode: 0640
|
||||
with_items:
|
||||
- "env-postgres-backup"
|
||||
when: matrix_postgres_backup_enabled|bool
|
||||
when: matrix_postgres_backup_enabled | bool
|
||||
|
||||
- name: Ensure matrix-postgres-backup.service installed
|
||||
ansible.builtin.template:
|
||||
@ -54,22 +54,22 @@
|
||||
dest: "{{ matrix_systemd_path }}/matrix-postgres-backup.service"
|
||||
mode: 0644
|
||||
register: matrix_postgres_backup_systemd_service_result
|
||||
when: matrix_postgres_backup_enabled|bool
|
||||
when: matrix_postgres_backup_enabled | bool
|
||||
|
||||
- name: Ensure systemd reloaded after matrix-postgres-backup.service installation
|
||||
ansible.builtin.service:
|
||||
daemon_reload: true
|
||||
when: "matrix_postgres_backup_enabled|bool and matrix_postgres_backup_systemd_service_result.changed"
|
||||
when: "matrix_postgres_backup_enabled | bool and matrix_postgres_backup_systemd_service_result.changed"
|
||||
|
||||
#
|
||||
# Tasks related to getting rid of the internal postgres backup server (if it was previously enabled)
|
||||
#
|
||||
|
||||
- name: Check existence of matrix-postgres-backup service
|
||||
stat:
|
||||
ansible.builtin.stat:
|
||||
path: "{{ matrix_systemd_path }}/matrix-postgres-backup.service"
|
||||
register: matrix_postgres_backup_service_stat
|
||||
when: "not matrix_postgres_backup_enabled|bool"
|
||||
when: "not matrix_postgres_backup_enabled | bool"
|
||||
|
||||
- name: Ensure matrix-postgres-backup is stopped
|
||||
ansible.builtin.service:
|
||||
@ -77,34 +77,34 @@
|
||||
state: stopped
|
||||
enabled: false
|
||||
daemon_reload: true
|
||||
when: "not matrix_postgres_backup_enabled|bool and matrix_postgres_backup_service_stat.stat.exists"
|
||||
when: "not matrix_postgres_backup_enabled | bool and matrix_postgres_backup_service_stat.stat.exists"
|
||||
|
||||
- name: Ensure matrix-postgres-backup.service doesn't exist
|
||||
ansible.builtin.file:
|
||||
path: "{{ matrix_systemd_path }}/matrix-postgres-backup.service"
|
||||
state: absent
|
||||
when: "not matrix_postgres_backup_enabled|bool and matrix_postgres_backup_service_stat.stat.exists"
|
||||
when: "not matrix_postgres_backup_enabled | bool and matrix_postgres_backup_service_stat.stat.exists"
|
||||
|
||||
- name: Ensure systemd reloaded after matrix-postgres-backup.service removal
|
||||
ansible.builtin.service:
|
||||
daemon_reload: true
|
||||
when: "not matrix_postgres_backup_enabled|bool and matrix_postgres_backup_service_stat.stat.exists"
|
||||
when: "not matrix_postgres_backup_enabled | bool and matrix_postgres_backup_service_stat.stat.exists"
|
||||
|
||||
- name: Check existence of matrix-postgres-backup backup path
|
||||
stat:
|
||||
ansible.builtin.stat:
|
||||
path: "{{ matrix_postgres_backup_path }}"
|
||||
register: matrix_postgres_backup_path_stat
|
||||
when: "not matrix_postgres_backup_enabled|bool"
|
||||
when: "not matrix_postgres_backup_enabled | bool"
|
||||
|
||||
# We just want to notify the user. Deleting data is too destructive.
|
||||
- name: Inject warning if matrix-postgres backup data remains
|
||||
ansible.builtin.set_fact:
|
||||
matrix_playbook_runtime_results: |
|
||||
{{
|
||||
matrix_playbook_runtime_results|default([])
|
||||
matrix_playbook_runtime_results | default([])
|
||||
+
|
||||
[
|
||||
"NOTE: You are not using the local backup service to backup the PostgreSQL database, but some old data remains from before in `{{ matrix_postgres_backup_path }}`. Feel free to delete it."
|
||||
]
|
||||
}}
|
||||
when: "not matrix_postgres_backup_enabled|bool and matrix_postgres_backup_path_stat.stat.exists"
|
||||
when: "not matrix_postgres_backup_enabled | bool and matrix_postgres_backup_path_stat.stat.exists"
|
||||
|
@ -11,7 +11,7 @@
|
||||
matrix_postgres_backup_detected_version_corresponding_docker_image: ""
|
||||
|
||||
- name: Determine existing Postgres version (check PG_VERSION file)
|
||||
stat:
|
||||
ansible.builtin.stat:
|
||||
path: "{{ matrix_postgres_backup_detection_pg_version_path }}"
|
||||
register: result_pg_version_stat
|
||||
|
||||
@ -23,12 +23,12 @@
|
||||
ansible.builtin.slurp:
|
||||
src: "{{ matrix_postgres_backup_detection_pg_version_path }}"
|
||||
register: result_pg_version
|
||||
when: matrix_postgres_backup_detected_existing|bool
|
||||
when: matrix_postgres_backup_detected_existing | bool
|
||||
|
||||
- name: Determine existing Postgres version (make sense of PG_VERSION file)
|
||||
ansible.builtin.set_fact:
|
||||
matrix_postgres_backup_detected_version: "{{ result_pg_version['content']|b64decode|replace('\n', '') }}"
|
||||
when: matrix_postgres_backup_detected_existing|bool
|
||||
when: matrix_postgres_backup_detected_existing | bool
|
||||
|
||||
- name: Determine corresponding Docker image to detected version (assume default of latest)
|
||||
ansible.builtin.set_fact:
|
||||
|
Reference in New Issue
Block a user