From 895f149a349ac733a284fe57653035c2b8f66764 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Tue, 30 Sep 2025 23:25:04 +0900 Subject: [PATCH] Rename `etherpad_database_*` to `etherpad_database_postgres_*` Signed-off-by: Suguru Hirahara --- group_vars/matrix_servers | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 606681aab..8f56c8d74 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -3793,10 +3793,10 @@ etherpad_systemd_required_services_list_auto: | ([postgres_identifier ~ '.service'] if postgres_enabled else []) }} -etherpad_database_hostname: "{{ postgres_connection_hostname if postgres_enabled else '' }}" +etherpad_database_postgres_hostname: "{{ postgres_connection_hostname if postgres_enabled else '' }}" etherpad_database_name: matrix_etherpad -etherpad_database_username: matrix_etherpad -etherpad_database_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'etherpad.db', rounds=655555) | to_uuid }}" +etherpad_database_postgres_username: matrix_etherpad +etherpad_database_postgres_password: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'etherpad.db', rounds=655555) | to_uuid }}" ###################################################################### # @@ -4492,9 +4492,9 @@ postgres_managed_databases_auto: | + ([{ 'name': etherpad_database_name, - 'username': etherpad_database_username, - 'password': etherpad_database_password, - }] if (etherpad_enabled and etherpad_database_type == 'postgres' and etherpad_database_hostname == postgres_connection_hostname) else []) + 'username': etherpad_database_postgres_username, + 'password': etherpad_database_postgres_password, + }] if (etherpad_enabled and etherpad_database_type == 'postgres' and etherpad_database_postgres_hostname == postgres_connection_hostname) else []) + ([{ 'name': prometheus_postgres_exporter_database_name,