mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2025-10-16 09:19:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4611 from luixxiul/etherpad

Browse Source 
Rename `etherpad_database_*` to `etherpad_database_postgres_*`
This commit is contained in:
Aine
2025-09-30 14:34:09 +00:00
committed by GitHub
parent 42aa749f14 895f149a34
commit 3467baf62f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
group_vars/matrix_servers
View File

@@ -3793,10 +3793,10 @@ etherpad_systemd_required_services_list_auto: |
([postgres_identifier ~ '.service'] if postgres_enabled else []) ([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_name: matrix_etherpad
etherpad_database_username: matrix_etherpad etherpad_database_postgres_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_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, 'name': etherpad_database_name,
'username': etherpad_database_username, 'username': etherpad_database_postgres_username,
'password': etherpad_database_password, 'password': etherpad_database_postgres_password,
}] if (etherpad_enabled and etherpad_database_type == 'postgres' and etherpad_database_hostname == postgres_connection_hostname) else []) }] if (etherpad_enabled and etherpad_database_type == 'postgres' and etherpad_database_postgres_hostname == postgres_connection_hostname) else [])
+ +
([{ ([{
'name': prometheus_postgres_exporter_database_name, 'name': prometheus_postgres_exporter_database_name,