fix: all praise the allmighty yamllinter
This commit is contained in:
		@@ -1,3 +1,4 @@
 | 
			
		||||
---
 | 
			
		||||
# See https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070
 | 
			
		||||
# and https://github.com/spantaleev/matrix-docker-ansible-deploy/commit/1ab507349c752042d26def3e95884f6df8886b74#commitcomment-51108407
 | 
			
		||||
- name: Fail if trying to self-build on Ansible < 2.8
 | 
			
		||||
@@ -39,40 +40,40 @@
 | 
			
		||||
  when: "matrix_synapse_role_executed|default(False)"
 | 
			
		||||
 | 
			
		||||
- block:
 | 
			
		||||
  - name: Fail if matrix-nginx-proxy role already executed
 | 
			
		||||
    fail:
 | 
			
		||||
      msg: >-
 | 
			
		||||
        Trying to append Slack Appservice's reverse-proxying configuration to matrix-nginx-proxy,
 | 
			
		||||
        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-bridge-appservice-slack role.
 | 
			
		||||
    when: matrix_nginx_proxy_role_executed|default(False)|bool
 | 
			
		||||
    - name: Fail if matrix-nginx-proxy role already executed
 | 
			
		||||
      fail:
 | 
			
		||||
        msg: >-
 | 
			
		||||
          Trying to append Slack Appservice's reverse-proxying configuration to matrix-nginx-proxy,
 | 
			
		||||
          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-bridge-appservice-slack role.
 | 
			
		||||
      when: matrix_nginx_proxy_role_executed|default(False)|bool
 | 
			
		||||
 | 
			
		||||
  - name: Generate Matrix Appservice Slack proxying configuration for matrix-nginx-proxy
 | 
			
		||||
    set_fact:
 | 
			
		||||
      matrix_appservice_slack_matrix_nginx_proxy_configuration: |
 | 
			
		||||
        location {{ matrix_appservice_slack_public_endpoint }} {
 | 
			
		||||
        {% 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_appservice_slack_appservice_url }}:{{ matrix_appservice_slack_slack_port }}";
 | 
			
		||||
        	proxy_pass $backend;
 | 
			
		||||
        {% else %}
 | 
			
		||||
        	{# Generic configuration for use outside of our container setup #}
 | 
			
		||||
        	proxy_pass http://127.0.0.1:{{ matrix_appservice_slack_slack_port }};
 | 
			
		||||
        {% endif %}
 | 
			
		||||
        }
 | 
			
		||||
    - name: Generate Matrix Appservice Slack proxying configuration for matrix-nginx-proxy
 | 
			
		||||
      set_fact:
 | 
			
		||||
        matrix_appservice_slack_matrix_nginx_proxy_configuration: |
 | 
			
		||||
          location {{ matrix_appservice_slack_public_endpoint }} {
 | 
			
		||||
          {% 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_appservice_slack_appservice_url }}:{{ matrix_appservice_slack_slack_port }}";
 | 
			
		||||
              proxy_pass $backend;
 | 
			
		||||
          {% else %}
 | 
			
		||||
              {# Generic configuration for use outside of our container setup #}
 | 
			
		||||
              proxy_pass http://127.0.0.1:{{ matrix_appservice_slack_slack_port }};
 | 
			
		||||
          {% endif %}
 | 
			
		||||
          }
 | 
			
		||||
 | 
			
		||||
  - name: Register Slack Appservice proxying configuration with matrix-nginx-proxy
 | 
			
		||||
    set_fact:
 | 
			
		||||
      matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
 | 
			
		||||
        {{
 | 
			
		||||
          matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks|default([])
 | 
			
		||||
          +
 | 
			
		||||
          [matrix_appservice_slack_matrix_nginx_proxy_configuration]
 | 
			
		||||
        }}
 | 
			
		||||
    - name: Register Slack Appservice proxying configuration with matrix-nginx-proxy
 | 
			
		||||
      set_fact:
 | 
			
		||||
        matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
 | 
			
		||||
          {{
 | 
			
		||||
            matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks|default([])
 | 
			
		||||
            +
 | 
			
		||||
            [matrix_appservice_slack_matrix_nginx_proxy_configuration]
 | 
			
		||||
          }}
 | 
			
		||||
  tags:
 | 
			
		||||
   - always
 | 
			
		||||
    - always
 | 
			
		||||
  when: matrix_appservice_slack_enabled|bool
 | 
			
		||||
 | 
			
		||||
- name: Warn about reverse-proxying if matrix-nginx-proxy not used
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,5 @@
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
- import_tasks: "{{ role_path }}/tasks/init.yml"
 | 
			
		||||
  tags:
 | 
			
		||||
    - always
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,5 @@
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
- name: Fail if Postgres not enabled
 | 
			
		||||
  fail:
 | 
			
		||||
    msg: "Postgres via the matrix-postgres role is not enabled (`matrix_postgres_enabled`). Cannot migrate."
 | 
			
		||||
@@ -16,7 +18,7 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-postgres
 | 
			
		||||
    state: started
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
  register: matrix_postgres_service_start_result
 | 
			
		||||
 | 
			
		||||
- name: Wait a bit, so that Postgres can start
 | 
			
		||||
 
 | 
			
		||||
@@ -8,10 +8,10 @@
 | 
			
		||||
    owner: "{{ matrix_user_username }}"
 | 
			
		||||
    group: "{{ matrix_user_groupname }}"
 | 
			
		||||
  with_items:
 | 
			
		||||
    - { path: "{{ matrix_appservice_slack_base_path }}", when: true }
 | 
			
		||||
    - { path: "{{ matrix_appservice_slack_config_path }}", when: true }
 | 
			
		||||
    - { path: "{{ matrix_appservice_slack_data_path }}", when: true }
 | 
			
		||||
    - { path: "{{ matrix_appservice_slack_docker_src_files_path }}", when: "{{ matrix_appservice_slack_container_image_self_build }}" }
 | 
			
		||||
    - {path: "{{ matrix_appservice_slack_base_path }}", when: true}
 | 
			
		||||
    - {path: "{{ matrix_appservice_slack_config_path }}", when: true}
 | 
			
		||||
    - {path: "{{ matrix_appservice_slack_data_path }}", when: true}
 | 
			
		||||
    - {path: "{{ matrix_appservice_slack_docker_src_files_path }}", when: "{{ matrix_appservice_slack_container_image_self_build }}"}
 | 
			
		||||
  when: item.when|bool
 | 
			
		||||
 | 
			
		||||
- set_fact:
 | 
			
		||||
@@ -56,7 +56,7 @@
 | 
			
		||||
    build:
 | 
			
		||||
      dockerfile: Dockerfile
 | 
			
		||||
      path: "{{ matrix_appservice_slack_docker_src_files_path }}"
 | 
			
		||||
      pull: yes
 | 
			
		||||
      pull: true
 | 
			
		||||
  when: "matrix_appservice_slack_container_image_self_build|bool and matrix_appservice_slack_git_pull_results.changed"
 | 
			
		||||
 | 
			
		||||
- name: Ensure Matrix Appservice Slack config installed
 | 
			
		||||
@@ -84,7 +84,7 @@
 | 
			
		||||
 | 
			
		||||
- name: Ensure systemd reloaded after matrix-appservice-slack.service installation
 | 
			
		||||
  service:
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
  when: "matrix_appservice_slack_systemd_service_result.changed"
 | 
			
		||||
 | 
			
		||||
- name: Ensure matrix-appservice-slack.service restarted, if necessary
 | 
			
		||||
 
 | 
			
		||||
@@ -9,8 +9,8 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-appservice-slack
 | 
			
		||||
    state: stopped
 | 
			
		||||
    enabled: no
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    enabled: false
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
  when: "matrix_appservice_slack_service_stat.stat.exists"
 | 
			
		||||
 | 
			
		||||
- name: Ensure matrix-appservice-slack.service doesn't exist
 | 
			
		||||
@@ -21,5 +21,5 @@
 | 
			
		||||
 | 
			
		||||
- name: Ensure systemd reloaded after matrix-appservice-slack.service removal
 | 
			
		||||
  service:
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
  when: "matrix_appservice_slack_service_stat.stat.exists"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user