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-redis'] }}"
|
||||
when: matrix_redis_enabled|bool
|
||||
when: matrix_redis_enabled | bool
|
||||
|
@@ -1,11 +1,11 @@
|
||||
---
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/init.yml"
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/init.yml"
|
||||
tags:
|
||||
- always
|
||||
|
||||
- import_tasks: "{{ role_path }}/tasks/setup_redis.yml"
|
||||
when: run_setup|bool
|
||||
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_redis.yml"
|
||||
when: run_setup | bool
|
||||
tags:
|
||||
- setup-all
|
||||
- setup-redis
|
||||
|
@@ -10,7 +10,7 @@
|
||||
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
||||
force_source: "{{ matrix_redis_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_redis_docker_image_force_pull }}"
|
||||
when: matrix_redis_enabled|bool
|
||||
when: matrix_redis_enabled | bool
|
||||
register: result
|
||||
retries: "{{ matrix_container_retries_count }}"
|
||||
delay: "{{ matrix_container_retries_delay }}"
|
||||
@@ -26,7 +26,7 @@
|
||||
with_items:
|
||||
- "{{ matrix_redis_base_path }}"
|
||||
- "{{ matrix_redis_data_path }}"
|
||||
when: matrix_redis_enabled|bool
|
||||
when: matrix_redis_enabled | bool
|
||||
|
||||
# We do this as a separate task, because:
|
||||
# - we'd like to do it for the data path only, not for the base path (which contains root-owned environment variable files we'd like to leave as-is)
|
||||
@@ -38,7 +38,7 @@
|
||||
owner: "{{ matrix_user_username }}"
|
||||
group: "{{ matrix_user_username }}"
|
||||
recurse: true
|
||||
when: matrix_redis_enabled|bool
|
||||
when: matrix_redis_enabled | bool
|
||||
|
||||
- name: Ensure redis environment variables file created
|
||||
ansible.builtin.template:
|
||||
@@ -47,7 +47,7 @@
|
||||
mode: 0644
|
||||
with_items:
|
||||
- "redis.conf"
|
||||
when: matrix_redis_enabled|bool
|
||||
when: matrix_redis_enabled | bool
|
||||
|
||||
- name: Ensure matrix-redis.service installed
|
||||
ansible.builtin.template:
|
||||
@@ -55,22 +55,22 @@
|
||||
dest: "{{ matrix_systemd_path }}/matrix-redis.service"
|
||||
mode: 0644
|
||||
register: matrix_redis_systemd_service_result
|
||||
when: matrix_redis_enabled|bool
|
||||
when: matrix_redis_enabled | bool
|
||||
|
||||
- name: Ensure systemd reloaded after matrix-redis.service installation
|
||||
ansible.builtin.service:
|
||||
daemon_reload: true
|
||||
when: "matrix_redis_enabled|bool and matrix_redis_systemd_service_result.changed"
|
||||
when: "matrix_redis_enabled | bool and matrix_redis_systemd_service_result.changed"
|
||||
|
||||
#
|
||||
# Tasks related to getting rid of the internal redis server (if it was previously enabled)
|
||||
#
|
||||
|
||||
- name: Check existence of matrix-redis service
|
||||
stat:
|
||||
ansible.builtin.stat:
|
||||
path: "{{ matrix_systemd_path }}/matrix-redis.service"
|
||||
register: matrix_redis_service_stat
|
||||
when: "not matrix_redis_enabled|bool"
|
||||
when: "not matrix_redis_enabled | bool"
|
||||
|
||||
- name: Ensure matrix-redis is stopped
|
||||
ansible.builtin.service:
|
||||
@@ -78,27 +78,27 @@
|
||||
state: stopped
|
||||
enabled: false
|
||||
daemon_reload: true
|
||||
when: "not matrix_redis_enabled|bool and matrix_redis_service_stat.stat.exists"
|
||||
when: "not matrix_redis_enabled | bool and matrix_redis_service_stat.stat.exists"
|
||||
|
||||
- name: Ensure matrix-redis.service doesn't exist
|
||||
ansible.builtin.file:
|
||||
path: "{{ matrix_systemd_path }}/matrix-redis.service"
|
||||
state: absent
|
||||
when: "not matrix_redis_enabled|bool and matrix_redis_service_stat.stat.exists"
|
||||
when: "not matrix_redis_enabled | bool and matrix_redis_service_stat.stat.exists"
|
||||
|
||||
- name: Ensure systemd reloaded after matrix-redis.service removal
|
||||
ansible.builtin.service:
|
||||
daemon_reload: true
|
||||
when: "not matrix_redis_enabled|bool and matrix_redis_service_stat.stat.exists"
|
||||
when: "not matrix_redis_enabled | bool and matrix_redis_service_stat.stat.exists"
|
||||
|
||||
- name: Check existence of matrix-redis local data path
|
||||
stat:
|
||||
ansible.builtin.stat:
|
||||
path: "{{ matrix_redis_data_path }}"
|
||||
register: matrix_redis_data_path_stat
|
||||
when: "not matrix_redis_enabled|bool"
|
||||
when: "not matrix_redis_enabled | bool"
|
||||
|
||||
# We just want to notify the user. Deleting data is too destructive.
|
||||
- name: Notify if matrix-redis local data remains
|
||||
ansible.builtin.debug:
|
||||
msg: "Note: You are not using a local redis instance, but some old data remains from before in `{{ matrix_redis_data_path }}`. Feel free to delete it."
|
||||
when: "not matrix_redis_enabled|bool and matrix_redis_data_path_stat.stat.exists"
|
||||
when: "not matrix_redis_enabled | bool and matrix_redis_data_path_stat.stat.exists"
|
||||
|
Reference in New Issue
Block a user