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

Replace include usage with include_tasks and import_tasks

Browse Source 
The long-deprecated (since Ansible 2.4) use of include is
no more.
This commit is contained in:
Slavi Pantaleev
2019-01-03 15:24:08 +02:00
parent 76506f34e0
commit 99af4543ac
12 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
roles/matrix-server/tasks/setup/main.yml
View File

@ -1,68 +1,68 @@
---
- include: tasks/setup/setup_sanity_check.yml
- import_tasks: tasks/setup/setup_sanity_check.yml
tags:
- always
- include: tasks/setup/setup_base.yml
- import_tasks: tasks/setup/setup_base.yml
tags:
- setup-all
- include: tasks/setup/setup_main.yml
- import_tasks: tasks/setup/setup_main.yml
tags:
- setup-all
- include: tasks/setup/ssl/main.yml
- import_tasks: tasks/setup/ssl/main.yml
tags:
- setup-all
- setup-ssl
- include: tasks/setup/setup_postgres.yml
- import_tasks: tasks/setup/setup_postgres.yml
tags:
- setup-all
- setup-postgres
- include: tasks/setup/setup_goofys.yml
- import_tasks: tasks/setup/setup_goofys.yml
tags:
- setup-all
- setup-goofys
- include: tasks/setup/setup_coturn.yml
- import_tasks: tasks/setup/setup_coturn.yml
tags:
- setup-all
- setup-coturn
- include: tasks/setup/setup_mailer.yml
- import_tasks: tasks/setup/setup_mailer.yml
tags:
- setup-all
- setup-mailer
- include: tasks/setup/setup_mxisd.yml
- import_tasks: tasks/setup/setup_mxisd.yml
tags:
- setup-all
- setup-mxisd
- include: tasks/setup/setup_corporal_overrides.yml
- import_tasks: tasks/setup/setup_corporal_overrides.yml
tags:
- always
- include: tasks/setup/setup_corporal.yml
- import_tasks: tasks/setup/setup_corporal.yml
tags:
- setup-all
- setup-corporal
- include: tasks/setup/synapse/main.yml
- import_tasks: tasks/setup/synapse/main.yml
tags:
- setup-all
- setup-synapse
- setup-coturn
- include: tasks/setup/setup_riot_web.yml
- import_tasks: tasks/setup/setup_riot_web.yml
tags:
- setup-all
- setup-riot-web
- include: tasks/setup/setup_well_known.yml
- import_tasks: tasks/setup/setup_well_known.yml
tags:
- setup-all
- setup-mxisd
@ -70,7 +70,7 @@
- setup-nginx-proxy
- setup-well-known
- include: tasks/setup/setup_nginx_proxy.yml
- import_tasks: tasks/setup/setup_nginx_proxy.yml
tags:
- setup-all
- setup-nginx-proxy

2
roles/matrix-server/tasks/setup/setup_postgres.yml
View File

@ -4,7 +4,7 @@
# Generic tasks, no matter what kind of server we're using (internal/external)
#
- include: tasks/util/detect_existing_postgres_version.yml
- import_tasks: tasks/util/detect_existing_postgres_version.yml
# If we have found an existing version (installed from before), we use its corresponding Docker image.
# If not, we install using the latest Postgres.

6
roles/matrix-server/tasks/setup/ssl/main.yml
View File

@ -31,8 +31,8 @@
# Method specific tasks follow
- include: tasks/setup/ssl/setup_ssl_lets_encrypt.yml
- import_tasks: tasks/setup/ssl/setup_ssl_lets_encrypt.yml
- include: tasks/setup/ssl/setup_ssl_self_signed.yml
- import_tasks: tasks/setup/ssl/setup_ssl_self_signed.yml
- include: tasks/setup/ssl/setup_ssl_manually_managed.yml
- import_tasks: tasks/setup/ssl/setup_ssl_manually_managed.yml

2
roles/matrix-server/tasks/setup/ssl/setup_ssl_lets_encrypt.yml
View File

@ -26,7 +26,7 @@
when: "matrix_ssl_retrieval_method == 'lets-encrypt'"
- name: Obtain Let's Encrypt certificates
include_tasks: "tasks/setup/ssl/setup_ssl_lets_encrypt_obtain_for_domain.yml"
include_tasks: "{{ role_path }}/tasks/setup/ssl/setup_ssl_lets_encrypt_obtain_for_domain.yml"
with_items: "{{ domains_requiring_certificates }}"
loop_control:
loop_var: domain_name

2
roles/matrix-server/tasks/setup/ssl/setup_ssl_manually_managed.yml
View File

@ -1,7 +1,7 @@
---
- name: Verify certificates
include_tasks: "tasks/setup/ssl/setup_ssl_manually_managed_verify_for_domain.yml"
include_tasks: "{{ role_path }}/tasks/setup/ssl/setup_ssl_manually_managed_verify_for_domain.yml"
with_items: "{{ domains_requiring_certificates }}"
loop_control:
loop_var: domain_name

2
roles/matrix-server/tasks/setup/ssl/setup_ssl_self_signed.yml
View File

@ -17,7 +17,7 @@
when: "matrix_ssl_retrieval_method == 'self-signed' and ansible_os_family == 'Debian'"
- name: Generate self-signed certificates
include_tasks: "tasks/setup/ssl/setup_ssl_self_signed_obtain_for_domain.yml"
include_tasks: "{{ role_path }}/tasks/setup/ssl/setup_ssl_self_signed_obtain_for_domain.yml"
with_items: "{{ domains_requiring_certificates }}"
loop_control:
loop_var: domain_name

10
roles/matrix-server/tasks/setup/synapse/ext/main.yml
View File

@ -1,11 +1,11 @@
---
- include: tasks/setup/synapse/ext/setup_synapse_ext_rest_auth.yml
- import_tasks: tasks/setup/synapse/ext/setup_synapse_ext_rest_auth.yml
- include: tasks/setup/synapse/ext/setup_synapse_ext_shared_secret_auth.yml
- import_tasks: tasks/setup/synapse/ext/setup_synapse_ext_shared_secret_auth.yml
- include: tasks/setup/synapse/ext/setup_synapse_ext_ldap_auth.yml
- import_tasks: tasks/setup/synapse/ext/setup_synapse_ext_ldap_auth.yml
- include: tasks/setup/synapse/ext/setup_synapse_ext_mautrix_telegram.yml
- import_tasks: tasks/setup/synapse/ext/setup_synapse_ext_mautrix_telegram.yml
- include: tasks/setup/synapse/ext/setup_synapse_ext_mautrix_whatsapp.yml
- import_tasks: tasks/setup/synapse/ext/setup_synapse_ext_mautrix_whatsapp.yml

6
roles/matrix-server/tasks/setup/synapse/main.yml
View File

@ -1,7 +1,7 @@
---
- include: tasks/setup/synapse/setup_synapse_pre.yml
- import_tasks: tasks/setup/synapse/setup_synapse_pre.yml
- include: tasks/setup/synapse/ext/main.yml
- import_tasks: tasks/setup/synapse/ext/main.yml
- include: tasks/setup/synapse/setup_synapse_main.yml
- import_tasks: tasks/setup/synapse/setup_synapse_main.yml