fix: all praise the allmighty yamllinter
This commit is contained in:
		@@ -57,7 +57,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
 | 
			
		||||
 
 | 
			
		||||
@@ -48,7 +48,7 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-postgres
 | 
			
		||||
    state: started
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
 | 
			
		||||
- name: Wait a bit, so that Postgres can start
 | 
			
		||||
  wait_for:
 | 
			
		||||
 
 | 
			
		||||
@@ -37,7 +37,7 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-postgres
 | 
			
		||||
    state: stopped
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
 | 
			
		||||
- name: Ensure postgres data is wiped out
 | 
			
		||||
  file:
 | 
			
		||||
@@ -56,7 +56,7 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-postgres
 | 
			
		||||
    state: restarted
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
 | 
			
		||||
- name: Wait a bit, so that Postgres can start
 | 
			
		||||
  wait_for:
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,5 @@
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
- set_fact:
 | 
			
		||||
    matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-postgres.service'] }}"
 | 
			
		||||
  when: matrix_postgres_enabled|bool
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,5 @@
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
- import_tasks: "{{ role_path }}/tasks/init.yml"
 | 
			
		||||
  tags:
 | 
			
		||||
    - always
 | 
			
		||||
 
 | 
			
		||||
@@ -29,7 +29,7 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-postgres
 | 
			
		||||
    state: stopped
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
  when: "result_pg_old_data_dir_stat.stat.exists"
 | 
			
		||||
 | 
			
		||||
- name: Find files and directories in old Postgres data path
 | 
			
		||||
@@ -68,5 +68,5 @@
 | 
			
		||||
 | 
			
		||||
- name: Ensure systemd reloaded after getting rid of outdated matrix-postgres.service
 | 
			
		||||
  service:
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
  when: "result_pg_old_data_dir_stat.stat.exists"
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,7 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-postgres
 | 
			
		||||
    state: started
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
 | 
			
		||||
- name: Wait a bit, so that Postgres can start
 | 
			
		||||
  wait_for:
 | 
			
		||||
@@ -71,7 +71,7 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-synapse
 | 
			
		||||
    state: stopped
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
 | 
			
		||||
- name: Run Postgres vacuum command
 | 
			
		||||
  command: "{{ matrix_postgres_vacuum_command }}"
 | 
			
		||||
@@ -86,5 +86,5 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-synapse
 | 
			
		||||
    state: started
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
  when: "matrix_postgres_synapse_was_running|bool"
 | 
			
		||||
 
 | 
			
		||||
@@ -65,7 +65,7 @@
 | 
			
		||||
    state: directory
 | 
			
		||||
    owner: "{{ matrix_user_username }}"
 | 
			
		||||
    group: "{{ matrix_user_groupname }}"
 | 
			
		||||
    recurse: yes
 | 
			
		||||
    recurse: true
 | 
			
		||||
  when: matrix_postgres_enabled|bool
 | 
			
		||||
 | 
			
		||||
- name: Ensure Postgres environment variables file created
 | 
			
		||||
@@ -115,7 +115,7 @@
 | 
			
		||||
 | 
			
		||||
- name: Ensure systemd reloaded after matrix-postgres.service installation
 | 
			
		||||
  service:
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
  when: "matrix_postgres_enabled|bool and matrix_postgres_systemd_service_result.changed"
 | 
			
		||||
 | 
			
		||||
- include_tasks:
 | 
			
		||||
@@ -158,7 +158,7 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-postgres
 | 
			
		||||
    state: stopped
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
  when: "not matrix_postgres_enabled|bool and matrix_postgres_service_stat.stat.exists"
 | 
			
		||||
 | 
			
		||||
- name: Ensure matrix-postgres.service doesn't exist
 | 
			
		||||
@@ -169,7 +169,7 @@
 | 
			
		||||
 | 
			
		||||
- name: Ensure systemd reloaded after matrix-postgres.service removal
 | 
			
		||||
  service:
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
  when: "not matrix_postgres_enabled|bool and matrix_postgres_service_stat.stat.exists"
 | 
			
		||||
 | 
			
		||||
- name: Check existence of matrix-postgres local data path
 | 
			
		||||
 
 | 
			
		||||
@@ -64,7 +64,7 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-postgres
 | 
			
		||||
    state: started
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
 | 
			
		||||
- name: Wait a bit, so that Postgres can start
 | 
			
		||||
  wait_for:
 | 
			
		||||
@@ -107,9 +107,9 @@
 | 
			
		||||
- name: Ensure matrix-postgres autoruns and is restarted
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-postgres
 | 
			
		||||
    enabled: yes
 | 
			
		||||
    enabled: true
 | 
			
		||||
    state: restarted
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
 | 
			
		||||
- name: Wait a bit, so that Postgres can start
 | 
			
		||||
  wait_for:
 | 
			
		||||
@@ -166,7 +166,7 @@
 | 
			
		||||
  service:
 | 
			
		||||
    name: matrix-synapse
 | 
			
		||||
    state: started
 | 
			
		||||
    daemon_reload: yes
 | 
			
		||||
    daemon_reload: true
 | 
			
		||||
 | 
			
		||||
- debug:
 | 
			
		||||
    msg: "NOTE: Your old Postgres data directory is preserved at `{{ postgres_auto_upgrade_backup_data_path }}`. You might want to get rid of it once you've confirmed that all is well."
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,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
 | 
			
		||||
 
 | 
			
		||||
@@ -66,7 +66,7 @@
 | 
			
		||||
        build:
 | 
			
		||||
          dockerfile: Dockerfile
 | 
			
		||||
          path: "{{ matrix_postgres_pgloader_container_image_self_build_src_path }}"
 | 
			
		||||
          pull: yes
 | 
			
		||||
          pull: true
 | 
			
		||||
  when: "matrix_postgres_pgloader_container_image_self_build|bool"
 | 
			
		||||
 | 
			
		||||
- name: Ensure pgloader Docker image is pulled
 | 
			
		||||
@@ -91,7 +91,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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user