finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix CONDITIONAL_BARE_VARS deprecation warning in ansible 2.8

Browse Source
This commit is contained in:
Dan Arnfield
2019-05-21 10:25:59 -05:00
parent affb99003c
commit 3982f114af
61 changed files with 224 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-bridge-mautrix-telegram/tasks/init.yml
View File

@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-telegram'] }}"
when: "matrix_mautrix_telegram_enabled"
when: matrix_mautrix_telegram_enabled|bool

6
roles/matrix-bridge-mautrix-telegram/tasks/main.yml
View File

@ -3,19 +3,19 @@
- always
- import_tasks: "{{ role_path }}/tasks/validate_config.yml"
when: "run_setup and matrix_mautrix_telegram_enabled"
when: "run_setup|bool and matrix_mautrix_telegram_enabled|bool"
tags:
- setup-all
- setup-mautrix-telegram
- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
when: "run_setup and matrix_mautrix_telegram_enabled"
when: "run_setup|bool and matrix_mautrix_telegram_enabled|bool"
tags:
- setup-all
- setup-mautrix-telegram
- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
when: "run_setup and not matrix_mautrix_telegram_enabled"
when: "run_setup|bool and not matrix_mautrix_telegram_enabled|bool"
tags:
- setup-all
- setup-mautrix-telegram

2
roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml
View File

@ -98,7 +98,7 @@
but it's pointless since the matrix-nginx-proxy role had already executed.
To fix this, please change the order of roles in your plabook,
so that the matrix-nginx-proxy role would run after the matrix-bridge-mautrix-telegram role.
when: "matrix_nginx_proxy_role_executed"
when: matrix_nginx_proxy_role_executed|bool
- name: Generate Mautrix Telegram proxying configuration for matrix-nginx-proxy
set_fact: