From 604ffe7d7920307719c21b97cf7f75911a54b296 Mon Sep 17 00:00:00 2001
From: foxcris <361299+foxcris@users.noreply.github.com>
Date: Tue, 16 Mar 2021 10:24:47 +0100
Subject: [PATCH] - adapted validate_config.yml to use the renamed variables

---
 .../tasks/validate_config.yml                  | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/roles/matrix-postgres-backup/tasks/validate_config.yml b/roles/matrix-postgres-backup/tasks/validate_config.yml
index 91d1783b..bc788db7 100644
--- a/roles/matrix-postgres-backup/tasks/validate_config.yml
+++ b/roles/matrix-postgres-backup/tasks/validate_config.yml
@@ -1,25 +1,15 @@
 ---
 
-# This is separate (from the other required variables below),
-# because we'd like to have a friendlier message for our existing users.
-- name: Fail if matrix_postgres_connection_password not defined
-  fail:
-    msg: >-
-      The playbook no longer has a default Postgres password defined in the `matrix_postgres_connection_password` variable, among lots of other Postgres changes.
-      You need to perform multiple manual steps to resolve this.
-      See our changelog for more details:
-      https://github.com/spantaleev/matrix-docker-ansible-deploy/blob/master/CHANGELOG.md#breaking-change-postgres-changes-that-require-manual-intervention
-  when: "matrix_postgres_connection_password == ''"
-
 - name: Fail if required Postgres settings not defined
   fail:
     msg: >-
       You need to define a required configuration setting (`{{ item }}`).
   when: "vars[item] == ''"
   with_items:
-    - "matrix_postgres_connection_hostname"
-    - "matrix_postgres_connection_username"
-    - "matrix_postgres_connection_password"
+    - "matrix_postgres_backup_connection_hostname"
+    - "matrix_postgres_backup_connection_username"
+    - "matrix_postgres_backup_connection_password"
+    - "matrix_postgres_backup_connection_port"
     - "matrix_postgres_backup_schedule"
     - "matrix_postgres_backup_keep_days"
     - "matrix_postgres_backup_keep_weeks"