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

More ansible-lint fixes

Browse Source
This commit is contained in:
Slavi Pantaleev
2022-07-18 11:22:05 +03:00
parent 34cdaade08
commit ddf18eadc7
337 changed files with 1720 additions and 1720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
roles/matrix-synapse-admin/tasks/init.yml
View File

@ -8,7 +8,7 @@
- ansible.builtin.set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-synapse-admin.service'] }}"
when: matrix_synapse_admin_enabled|bool
when: matrix_synapse_admin_enabled | bool
- block:
- name: Fail if matrix-nginx-proxy role already executed
@ -18,7 +18,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 playbook,
so that the matrix-nginx-proxy role would run after the matrix-synapse-admin role.
when: matrix_nginx_proxy_role_executed|default(False)|bool
when: matrix_nginx_proxy_role_executed | default(False) | bool
- name: Generate Synapse Admin proxying configuration for matrix-nginx-proxy
ansible.builtin.set_fact:
@ -26,7 +26,7 @@
rewrite ^{{ matrix_synapse_admin_public_endpoint }}$ {{ matrix_nginx_proxy_x_forwarded_proto_value }}://$server_name{{ matrix_synapse_admin_public_endpoint }}/ permanent;
location ~ ^{{ matrix_synapse_admin_public_endpoint }}/(.*) {
{% if matrix_nginx_proxy_enabled|default(False) %}
{% if matrix_nginx_proxy_enabled | default(False) %}
{# Use the embedded DNS resolver in Docker containers to discover the service #}
resolver 127.0.0.11 valid=5s;
set $backend "matrix-synapse-admin:80";
@ -41,13 +41,13 @@
ansible.builtin.set_fact:
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
{{
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks|default([])
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks | default([])
+
[matrix_synapse_admin_matrix_nginx_proxy_configuration]
}}
tags:
- always
when: matrix_synapse_admin_enabled|bool
when: matrix_synapse_admin_enabled | bool
- name: Warn about reverse-proxying if matrix-nginx-proxy not used
ansible.builtin.debug:
@ -57,4 +57,4 @@
Please make sure that you're proxying the `{{ matrix_synapse_admin_public_endpoint }}`
URL endpoint to the matrix-synapse-admin container.
You can expose the container's port using the `matrix_synapse_admin_container_http_host_bind_port` variable.
when: "matrix_synapse_admin_enabled|bool and not matrix_nginx_proxy_enabled|default(False)|bool"
when: "matrix_synapse_admin_enabled | bool and not matrix_nginx_proxy_enabled | default(False) | bool"

8
roles/matrix-synapse-admin/tasks/main.yml
View File

@ -1,16 +1,16 @@
---
- 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
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
when: run_setup | bool
tags:
- setup-all
- setup-synapse-admin
- import_tasks: "{{ role_path }}/tasks/setup.yml"
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup.yml"
tags:
- setup-all
- setup-synapse-admin

20
roles/matrix-synapse-admin/tasks/setup.yml
View File

@ -10,7 +10,7 @@
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_synapse_admin_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_synapse_admin_docker_image_force_pull }}"
when: "matrix_synapse_admin_enabled|bool and not matrix_synapse_admin_container_image_self_build|bool"
when: "matrix_synapse_admin_enabled | bool and not matrix_synapse_admin_container_image_self_build | bool"
register: result
retries: "{{ matrix_container_retries_count }}"
delay: "{{ matrix_container_retries_delay }}"
@ -25,7 +25,7 @@
become: true
become_user: "{{ matrix_user_username }}"
register: matrix_synapse_admin_git_pull_results
when: "matrix_synapse_admin_enabled|bool and matrix_synapse_admin_container_image_self_build|bool"
when: "matrix_synapse_admin_enabled | bool and matrix_synapse_admin_container_image_self_build | bool"
- name: Ensure matrix-synapse-admin Docker image is built
docker_image:
@ -37,7 +37,7 @@
dockerfile: Dockerfile
path: "{{ matrix_synapse_admin_docker_src_files_path }}"
pull: true
when: "matrix_synapse_admin_enabled|bool and matrix_synapse_admin_container_image_self_build|bool"
when: "matrix_synapse_admin_enabled | bool and matrix_synapse_admin_container_image_self_build | bool"
- name: Ensure matrix-synapse-admin.service installed
ansible.builtin.template:
@ -45,19 +45,19 @@
dest: "{{ matrix_systemd_path }}/matrix-synapse-admin.service"
mode: 0644
register: matrix_synapse_admin_systemd_service_result
when: matrix_synapse_admin_enabled|bool
when: matrix_synapse_admin_enabled | bool
- name: Ensure systemd reloaded after matrix-synapse-admin.service installation
ansible.builtin.service:
daemon_reload: true
when: "matrix_synapse_admin_enabled|bool and matrix_synapse_admin_systemd_service_result.changed"
when: "matrix_synapse_admin_enabled | bool and matrix_synapse_admin_systemd_service_result.changed"
#
# Tasks related to getting rid of matrix-synapse-admin (if it was previously enabled)
#
- name: Check existence of matrix-synapse-admin service
stat:
ansible.builtin.stat:
path: "{{ matrix_systemd_path }}/matrix-synapse-admin.service"
register: matrix_synapse_admin_service_stat
@ -68,21 +68,21 @@
enabled: false
daemon_reload: true
register: stopping_result
when: "not matrix_synapse_admin_enabled|bool and matrix_synapse_admin_service_stat.stat.exists"
when: "not matrix_synapse_admin_enabled | bool and matrix_synapse_admin_service_stat.stat.exists"
- name: Ensure matrix-synapse-admin.service doesn't exist
ansible.builtin.file:
path: "{{ matrix_systemd_path }}/matrix-synapse-admin.service"
state: absent
when: "not matrix_synapse_admin_enabled|bool and matrix_synapse_admin_service_stat.stat.exists"
when: "not matrix_synapse_admin_enabled | bool and matrix_synapse_admin_service_stat.stat.exists"
- name: Ensure systemd reloaded after matrix-synapse-admin.service removal
ansible.builtin.service:
daemon_reload: true
when: "not matrix_synapse_admin_enabled|bool and matrix_synapse_admin_service_stat.stat.exists"
when: "not matrix_synapse_admin_enabled | bool and matrix_synapse_admin_service_stat.stat.exists"
- name: Ensure matrix-synapse-admin Docker image doesn't exist
docker_image:
name: "{{ matrix_synapse_admin_docker_image }}"
state: absent
when: "not matrix_synapse_admin_enabled|bool"
when: "not matrix_synapse_admin_enabled | bool"