From 883afa11dc9302358c006905cda3ed05cb9a06d1 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 9 Jan 2024 16:02:31 +0200
Subject: [PATCH] Do not hardcode devture_postgres_identifier in
 matrix-media-repo role

This should come (and already does) from group_vars/matrix_servers
---
 group_vars/matrix_servers                              |  1 +
 roles/custom/matrix-media-repo/defaults/main.yml       |  2 +-
 .../custom/matrix-media-repo/tasks/validate_config.yml | 10 +++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 42ca31f00..590dc399b 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -2720,6 +2720,7 @@ matrix_ma1sd_database_password: "{{ '%s' | format(matrix_homeserver_generic_secr
 ######################################################################
 
 matrix_media_repo_enabled: false
+
 matrix_media_repo_container_network: "{{ matrix_nginx_proxy_container_network if matrix_playbook_reverse_proxy_type == 'playbook-managed-nginx' else matrix_media_repo_identifier }}"
 
 matrix_media_repo_container_additional_networks: |
diff --git a/roles/custom/matrix-media-repo/defaults/main.yml b/roles/custom/matrix-media-repo/defaults/main.yml
index bb9d1fe3a..31bb6b791 100755
--- a/roles/custom/matrix-media-repo/defaults/main.yml
+++ b/roles/custom/matrix-media-repo/defaults/main.yml
@@ -216,7 +216,7 @@ matrix_media_repo_federation_ignored_hosts: []
 # user instead. Using the same server is fine, just not the same username and database.
 matrix_media_repo_database_username: "matrix_media_repo"
 matrix_media_repo_database_password: ""
-matrix_media_repo_database_hostname: "{{ devture_postgres_identifier }}"
+matrix_media_repo_database_hostname: ""
 matrix_media_repo_database_port: 5432
 matrix_media_repo_database_name: "matrix_media_repo"
 matrix_media_repo_database_sslmode: disable
diff --git a/roles/custom/matrix-media-repo/tasks/validate_config.yml b/roles/custom/matrix-media-repo/tasks/validate_config.yml
index fdde7b02b..7ee39ccc2 100644
--- a/roles/custom/matrix-media-repo/tasks/validate_config.yml
+++ b/roles/custom/matrix-media-repo/tasks/validate_config.yml
@@ -1,6 +1,14 @@
 ---
 
-- name: (Deprecation) Catch and report renamed settings
+- name: Fail if required matrix-media-repo settings not defined
+  ansible.builtin.fail:
+    msg: >
+      You need to define a required configuration setting (`{{ item.name }}`).
+  when: "item.when | bool and vars[item.name] == ''"
+  with_items:
+    - {'name': 'matrix_media_repo_database_hostname', when: true}
+
+- name: (Deprecation) Catch and report renamed matrix-media-repo settings
   ansible.builtin.fail:
     msg: >-
       Your configuration contains a variable, which now has a different name.