Rename `matrix_*_postgres_*` back to `matrix_*_database_*`

I was thinking that it makes sense to be more specific,
and using `_postgres_` also separated these variables
from the `_database_` variables that ended up in bridge configuration.

However, @jdreichmann makes a good point
(https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/740#discussion_r542281102)
that we don't need to be so specific and can allow for other engines (like MySQL) to use these variables.

group_vars/matrix_servers

@@ -70,7 +70,7 @@ matrix_appservice_discord_homeserver_token: "{{ matrix_synapse_macaroon_secret_k
 # We only make this use Postgres if our own Postgres server is enabled.
 # It's only then (for now) that we can automatically create the necessary database and user for this service.
 matrix_appservice_discord_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_appservice_discord_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.discord.db') | to_uuid }}"
+matrix_appservice_discord_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.discord.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -142,7 +142,7 @@ matrix_appservice_slack_systemd_required_services_list: |
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_appservice_slack_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_appservice_slack_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.slack.db') | to_uuid }}"
+matrix_appservice_slack_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.slack.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -181,7 +181,7 @@ matrix_appservice_irc_homeserver_token: "{{ matrix_synapse_macaroon_secret_key |
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_appservice_irc_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_appservice_irc_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.irc.db') | to_uuid }}"
+matrix_appservice_irc_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.irc.db') | to_uuid }}"
 
 
 ######################################################################
@@ -219,7 +219,7 @@ matrix_mautrix_facebook_bridge_presence: "{{ matrix_synapse_use_presence if matr
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_mautrix_facebook_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_mautrix_facebook_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mautrix_facebook.db') | to_uuid }}"
+matrix_mautrix_facebook_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mautrix_facebook.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -256,7 +256,7 @@ matrix_mautrix_hangouts_login_shared_secret: "{{ matrix_synapse_ext_password_pro
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_mautrix_hangouts_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_mautrix_hangouts_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mautrix_hangouts.db') | to_uuid }}"
+matrix_mautrix_hangouts_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mautrix_hangouts.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -296,7 +296,7 @@ matrix_mautrix_telegram_login_shared_secret: "{{ matrix_synapse_ext_password_pro
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_mautrix_telegram_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_mautrix_telegram_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mautrix_telegram.db') | to_uuid }}"
+matrix_mautrix_telegram_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mautrix_telegram.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -328,7 +328,7 @@ matrix_mautrix_whatsapp_login_shared_secret: "{{ matrix_synapse_ext_password_pro
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_mautrix_whatsapp_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_mautrix_whatsapp_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mautrix_whatsapp.db') | to_uuid }}"
+matrix_mautrix_whatsapp_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mautrix_whatsapp.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -388,7 +388,7 @@ matrix_mx_puppet_skype_login_shared_secret: "{{ matrix_synapse_ext_password_prov
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_mx_puppet_skype_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_mx_puppet_skype_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_skype.db') | to_uuid }}"
+matrix_mx_puppet_skype_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_skype.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -423,7 +423,7 @@ matrix_mx_puppet_slack_login_shared_secret: "{{ matrix_synapse_ext_password_prov
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_mx_puppet_slack_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_mx_puppet_slack_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_slack.db') | to_uuid }}"
+matrix_mx_puppet_slack_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_slack.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -459,7 +459,7 @@ matrix_mx_puppet_twitter_container_http_host_bind_port: "{{ '' if matrix_nginx_p
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_mx_puppet_twitter_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_mx_puppet_twitter_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_twitter.db') | to_uuid }}"
+matrix_mx_puppet_twitter_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_twitter.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -494,7 +494,7 @@ matrix_mx_puppet_instagram_login_shared_secret: "{{ matrix_synapse_ext_password_
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_mx_puppet_instagram_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_mx_puppet_instagram_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_instagram.db') | to_uuid }}"
+matrix_mx_puppet_instagram_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_instagram.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -528,7 +528,7 @@ matrix_mx_puppet_discord_login_shared_secret: "{{ matrix_synapse_ext_password_pr
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_mx_puppet_discord_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_mx_puppet_discord_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_discord.db') | to_uuid }}"
+matrix_mx_puppet_discord_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_discord.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -562,7 +562,7 @@ matrix_mx_puppet_steam_login_shared_secret: "{{ matrix_synapse_ext_password_prov
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_mx_puppet_stream_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_mx_puppet_steam_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_steam.db') | to_uuid }}"
+matrix_mx_puppet_steam_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.mx_puppet_steam.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -676,7 +676,7 @@ matrix_integration_manager_ui_url: "{{ matrix_dimension_integrations_ui_url if m
 
 # Postgres is the default, except if not using `matrix_postgres` (internal postgres)
 matrix_dimension_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
-matrix_dimension_postgres_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.dimension.db') | to_uuid }}"
+matrix_dimension_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'as.dimension.db') | to_uuid }}"
 
 ######################################################################
 #
@@ -950,39 +950,39 @@ matrix_postgres_db_name: "homeserver"
 matrix_postgres_additional_databases: |
   {{
     ([{
-      'name': matrix_appservice_discord_postgres_db_name,
-      'username': matrix_appservice_discord_postgres_username,
-      'password': matrix_appservice_discord_postgres_password,
+      'name': matrix_appservice_discord_database_db_name,
+      'username': matrix_appservice_discord_database_username,
+      'password': matrix_appservice_discord_database_password,
     }] if (matrix_appservice_discord_enabled and matrix_appservice_discord_database_engine == 'postgres' and matrix_appservice_discord_postgres_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_appservice_slack_postgres_db_name,
-      'username': matrix_appservice_slack_postgres_username,
-      'password': matrix_appservice_slack_postgres_password,
+      'name': matrix_appservice_slack_database_db_name,
+      'username': matrix_appservice_slack_database_username,
+      'password': matrix_appservice_slack_database_password,
     }] if (matrix_appservice_slack_enabled and matrix_appservice_slack_database_engine == 'postgres' and matrix_appservice_slack_postgres_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_appservice_irc_postgres_db_name,
-      'username': matrix_appservice_irc_postgres_username,
-      'password': matrix_appservice_irc_postgres_password,
+      'name': matrix_appservice_irc_database_db_name,
+      'username': matrix_appservice_irc_database_username,
+      'password': matrix_appservice_irc_database_password,
     }] if (matrix_appservice_irc_enabled and matrix_appservice_irc_database_engine == 'postgres' and matrix_appservice_irc_postgres_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_facebook_postgres_db_name,
-      'username': matrix_mautrix_facebook_postgres_username,
-      'password': matrix_mautrix_facebook_postgres_password,
+      'name': matrix_mautrix_facebook_database_db_name,
+      'username': matrix_mautrix_facebook_database_username,
+      'password': matrix_mautrix_facebook_database_password,
     }] if (matrix_mautrix_facebook_enabled and matrix_mautrix_facebook_database_engine == 'postgres' and matrix_mautrix_facebook_postgres_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_hangouts_postgres_db_name,
-      'username': matrix_mautrix_hangouts_postgres_username,
-      'password': matrix_mautrix_hangouts_postgres_password,
+      'name': matrix_mautrix_hangouts_database_db_name,
+      'username': matrix_mautrix_hangouts_database_username,
+      'password': matrix_mautrix_hangouts_database_password,
     }] if (matrix_mautrix_hangouts_enabled and matrix_mautrix_hangouts_database_engine == 'postgres' and matrix_mautrix_hangouts_postgres_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_telegram_postgres_db_name,
-      'username': matrix_mautrix_telegram_postgres_username,
-      'password': matrix_mautrix_telegram_postgres_password,
+      'name': matrix_mautrix_telegram_database_db_name,
+      'username': matrix_mautrix_telegram_database_username,
+      'password': matrix_mautrix_telegram_database_password,
     }] if (matrix_mautrix_telegram_enabled and matrix_mautrix_telegram_database_engine == 'postgres' and matrix_mautrix_telegram_postgres_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_whatsapp_postgres_db_name,
-      'username': matrix_mautrix_whatsapp_postgres_username,
-      'password': matrix_mautrix_whatsapp_postgres_password,
+      'name': matrix_mautrix_whatsapp_database_db_name,
+      'username': matrix_mautrix_whatsapp_database_username,
+      'password': matrix_mautrix_whatsapp_database_password,
     }] if (matrix_mautrix_whatsapp_enabled and matrix_mautrix_whatsapp_database_engine == 'postgres' and matrix_mautrix_whatsapp_postgres_hostname == 'matrix-postgres') else [])
     + ([{
       'name': 'matrix_bridge_sms',
@@ -990,45 +990,45 @@ matrix_postgres_additional_databases: |
       'password': matrix_synapse_macaroon_secret_key | password_hash('sha512', 'bridge_sms.db.secret') | to_uuid,
     }] if matrix_sms_bridge_enabled else [])
     + ([{
-      'name': matrix_mx_puppet_skype_postgres_db_name,
-      'username': matrix_mx_puppet_skype_postgres_username,
-      'password': matrix_mx_puppet_skype_postgres_password,
+      'name': matrix_mx_puppet_skype_database_db_name,
+      'username': matrix_mx_puppet_skype_database_username,
+      'password': matrix_mx_puppet_skype_database_password,
     }] if (matrix_mx_puppet_skype_enabled and matrix_mx_puppet_skype_database_engine == 'postgres' and matrix_mx_puppet_skype_postgres_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mx_puppet_slack_postgres_db_name,
-      'username': matrix_mx_puppet_slack_postgres_username,
-      'password': matrix_mx_puppet_slack_postgres_password,
+      'name': matrix_mx_puppet_slack_database_db_name,
+      'username': matrix_mx_puppet_slack_database_username,
+      'password': matrix_mx_puppet_slack_database_password,
     }] if (matrix_mx_puppet_slack_enabled and matrix_mx_puppet_slack_database_engine == 'postgres' and matrix_mx_puppet_slack_postgres_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_twitter_postgres_db_name,
-      'username': matrix_mx_puppet_twitter_postgres_username,
-      'password': matrix_mx_puppet_twitter_postgres_password,
+      'name': matrix_mx_puppet_twitter_database_db_name,
+      'username': matrix_mx_puppet_twitter_database_username,
+      'password': matrix_mx_puppet_twitter_database_password,
     }] if (matrix_mx_puppet_twitter_enabled and matrix_mx_puppet_twitter_database_engine == 'postgres' and matrix_mx_puppet_twitter_postgres_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_instagram_postgres_db_name,
-      'username': matrix_mx_puppet_instagram_postgres_username,
-      'password': matrix_mx_puppet_instagram_postgres_password,
+      'name': matrix_mx_puppet_instagram_database_db_name,
+      'username': matrix_mx_puppet_instagram_database_username,
+      'password': matrix_mx_puppet_instagram_database_password,
     }] if (matrix_mx_puppet_instagram_enabled
            and matrix_mx_puppet_instagram_database_engine == 'postgres'
            and matrix_mx_puppet_instagram_postgres_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_discord_postgres_db_name,
-      'username': matrix_mx_puppet_discord_postgres_username,
-      'password': matrix_mx_puppet_discord_postgres_password,
+      'name': matrix_mx_puppet_discord_database_db_name,
+      'username': matrix_mx_puppet_discord_database_username,
+      'password': matrix_mx_puppet_discord_database_password,
     }] if (matrix_mx_puppet_discord_enabled
            and matrix_mx_puppet_discord_database_engine == 'postgres'
            and matrix_mx_puppet_discord_postgres_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_steam_postgres_db_name,
-      'username': matrix_mx_puppet_steam_postgres_username,
-      'password': matrix_mx_puppet_steam_postgres_password,
+      'name': matrix_mx_puppet_steam_database_db_name,
+      'username': matrix_mx_puppet_steam_database_username,
+      'password': matrix_mx_puppet_steam_database_password,
     }] if (matrix_mx_puppet_steam_enabled
            and matrix_mx_puppet_steam_database_engine == 'postgres'
            and matrix_mx_puppet_steam_postgres_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_dimension_postgres_db_name,
-      'username': matrix_dimension_postgres_username,
-      'password': matrix_dimension_postgres_password,
+      'name': matrix_dimension_database_db_name,
+      'username': matrix_dimension_database_username,
+      'password': matrix_dimension_database_password,
     }] if (matrix_dimension_enabled
            and matrix_dimension_database_engine == 'postgres'
            and matrix_dimension_postgres_hostname == 'matrix-postgres') else [])

roles/matrix-bridge-appservice-discord/defaults/main.yml

@@ -53,16 +53,16 @@ matrix_appservice_discord_database_engine: 'sqlite'
 matrix_appservice_discord_sqlite_database_path_local: "{{ matrix_appservice_discord_data_path }}/discord.db"
 matrix_appservice_discord_sqlite_database_path_in_container: "/data/discord.db"
 
-matrix_appservice_discord_postgres_username: 'matrix_appservice_discord'
-matrix_appservice_discord_postgres_password: 'some-password'
+matrix_appservice_discord_database_username: 'matrix_appservice_discord'
+matrix_appservice_discord_database_password: 'some-password'
 matrix_appservice_discord_postgres_hostname: 'matrix-postgres'
-matrix_appservice_discord_postgres_port: 5432
-matrix_appservice_discord_postgres_db_name: 'matrix_appservice_discord'
+matrix_appservice_discord_database_port: 5432
+matrix_appservice_discord_database_db_name: 'matrix_appservice_discord'
 
 # These 2 variables are what actually ends up in the bridge configuration.
 # It's best if you don't change them directly, but rather redefine the sub-variables that constitute them.
 matrix_appservice_discord_database_filename: "{{ matrix_appservice_discord_sqlite_database_path_in_container }}"
-matrix_appservice_discord_database_connString: 'postgresql://{{ matrix_appservice_discord_postgres_username }}:{{ matrix_appservice_discord_postgres_password }}@{{ matrix_appservice_discord_postgres_hostname }}:{{ matrix_appservice_discord_postgres_port }}/{{ matrix_appservice_discord_postgres_db_name }}'
+matrix_appservice_discord_database_connString: 'postgresql://{{ matrix_appservice_discord_database_username }}:{{ matrix_appservice_discord_database_password }}@{{ matrix_appservice_discord_postgres_hostname }}:{{ matrix_appservice_discord_database_port }}/{{ matrix_appservice_discord_database_db_name }}'
 
 
 # Tells whether the bot should make use of "Privileged Gateway Intents".

roles/matrix-bridge-mautrix-facebook/defaults/main.yml

@@ -45,13 +45,13 @@ matrix_mautrix_facebook_database_engine: 'sqlite'
 matrix_mautrix_facebook_sqlite_database_path_local: "{{ matrix_mautrix_facebook_data_path }}/mautrix-facebook.db"
 matrix_mautrix_facebook_sqlite_database_path_in_container: "/data/mautrix-facebook.db"
 
-matrix_mautrix_facebook_postgres_username: 'matrix_mautrix_facebook'
-matrix_mautrix_facebook_postgres_password: 'some-password'
+matrix_mautrix_facebook_database_username: 'matrix_mautrix_facebook'
+matrix_mautrix_facebook_database_password: 'some-password'
 matrix_mautrix_facebook_postgres_hostname: 'matrix-postgres'
-matrix_mautrix_facebook_postgres_port: 5432
-matrix_mautrix_facebook_postgres_db_name: 'matrix_mautrix_facebook'
+matrix_mautrix_facebook_database_port: 5432
+matrix_mautrix_facebook_database_db_name: 'matrix_mautrix_facebook'
 
-matrix_mautrix_facebook_postgres_connection_string: 'postgresql://{{ matrix_mautrix_facebook_postgres_username }}:{{ matrix_mautrix_facebook_postgres_password }}@{{ matrix_mautrix_facebook_postgres_hostname }}:{{ matrix_mautrix_facebook_postgres_port }}/{{ matrix_mautrix_facebook_postgres_db_name }}'
+matrix_mautrix_facebook_postgres_connection_string: 'postgresql://{{ matrix_mautrix_facebook_database_username }}:{{ matrix_mautrix_facebook_database_password }}@{{ matrix_mautrix_facebook_postgres_hostname }}:{{ matrix_mautrix_facebook_database_port }}/{{ matrix_mautrix_facebook_database_db_name }}'
 
 matrix_mautrix_facebook_appservice_database: "{{
 	{

roles/matrix-bridge-mautrix-hangouts/defaults/main.yml

@@ -52,13 +52,13 @@ matrix_mautrix_hangouts_database_engine: 'sqlite'
 matrix_mautrix_hangouts_sqlite_database_path_local: "{{ matrix_mautrix_hangouts_data_path }}/mautrix-hangouts.db"
 matrix_mautrix_hangouts_sqlite_database_path_in_container: "/data/mautrix-hangouts.db"
 
-matrix_mautrix_hangouts_postgres_username: 'matrix_mautrix_hangouts'
-matrix_mautrix_hangouts_postgres_password: 'some-password'
+matrix_mautrix_hangouts_database_username: 'matrix_mautrix_hangouts'
+matrix_mautrix_hangouts_database_password: 'some-password'
 matrix_mautrix_hangouts_postgres_hostname: 'matrix-postgres'
-matrix_mautrix_hangouts_postgres_port: 5432
-matrix_mautrix_hangouts_postgres_db_name: 'matrix_mautrix_hangouts'
+matrix_mautrix_hangouts_database_port: 5432
+matrix_mautrix_hangouts_database_db_name: 'matrix_mautrix_hangouts'
 
-matrix_mautrix_hangouts_postgres_connection_string: 'postgresql://{{ matrix_mautrix_hangouts_postgres_username }}:{{ matrix_mautrix_hangouts_postgres_password }}@{{ matrix_mautrix_hangouts_postgres_hostname }}:{{ matrix_mautrix_hangouts_postgres_port }}/{{ matrix_mautrix_hangouts_postgres_db_name }}'
+matrix_mautrix_hangouts_postgres_connection_string: 'postgresql://{{ matrix_mautrix_hangouts_database_username }}:{{ matrix_mautrix_hangouts_database_password }}@{{ matrix_mautrix_hangouts_postgres_hostname }}:{{ matrix_mautrix_hangouts_database_port }}/{{ matrix_mautrix_hangouts_database_db_name }}'
 
 matrix_mautrix_hangouts_appservice_database: "{{
 	{

roles/matrix-bridge-mautrix-telegram/defaults/main.yml

@@ -56,13 +56,13 @@ matrix_mautrix_telegram_database_engine: 'sqlite'
 matrix_mautrix_telegram_sqlite_database_path_local: "{{ matrix_mautrix_telegram_data_path }}/mautrix-telegram.db"
 matrix_mautrix_telegram_sqlite_database_path_in_container: "/data/mautrix-telegram.db"
 
-matrix_mautrix_telegram_postgres_username: 'matrix_mautrix_telegram'
-matrix_mautrix_telegram_postgres_password: 'some-password'
+matrix_mautrix_telegram_database_username: 'matrix_mautrix_telegram'
+matrix_mautrix_telegram_database_password: 'some-password'
 matrix_mautrix_telegram_postgres_hostname: 'matrix-postgres'
-matrix_mautrix_telegram_postgres_port: 5432
-matrix_mautrix_telegram_postgres_db_name: 'matrix_mautrix_telegram'
+matrix_mautrix_telegram_database_port: 5432
+matrix_mautrix_telegram_database_db_name: 'matrix_mautrix_telegram'
 
-matrix_mautrix_telegram_postgres_connection_string: 'postgresql://{{ matrix_mautrix_telegram_postgres_username }}:{{ matrix_mautrix_telegram_postgres_password }}@{{ matrix_mautrix_telegram_postgres_hostname }}:{{ matrix_mautrix_telegram_postgres_port }}/{{ matrix_mautrix_telegram_postgres_db_name }}'
+matrix_mautrix_telegram_postgres_connection_string: 'postgresql://{{ matrix_mautrix_telegram_database_username }}:{{ matrix_mautrix_telegram_database_password }}@{{ matrix_mautrix_telegram_postgres_hostname }}:{{ matrix_mautrix_telegram_database_port }}/{{ matrix_mautrix_telegram_database_db_name }}'
 
 matrix_mautrix_telegram_appservice_database: "{{
 	{

roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml

@@ -40,13 +40,13 @@ matrix_mautrix_whatsapp_database_engine: 'sqlite'
 matrix_mautrix_whatsapp_sqlite_database_path_local: "{{ matrix_mautrix_whatsapp_data_path }}/mautrix-whatsapp.db"
 matrix_mautrix_whatsapp_sqlite_database_path_in_container: "/data/mautrix-whatsapp.db"
 
-matrix_mautrix_whatsapp_postgres_username: 'matrix_mautrix_whatsapp'
-matrix_mautrix_whatsapp_postgres_password: 'some-password'
+matrix_mautrix_whatsapp_database_username: 'matrix_mautrix_whatsapp'
+matrix_mautrix_whatsapp_database_password: 'some-password'
 matrix_mautrix_whatsapp_postgres_hostname: 'matrix-postgres'
-matrix_mautrix_whatsapp_postgres_port: 5432
-matrix_mautrix_whatsapp_postgres_db_name: 'matrix_mautrix_whatsapp'
+matrix_mautrix_whatsapp_database_port: 5432
+matrix_mautrix_whatsapp_database_db_name: 'matrix_mautrix_whatsapp'
 
-matrix_mautrix_whatsapp_postgres_connection_string: 'postgresql://{{ matrix_mautrix_whatsapp_postgres_username }}:{{ matrix_mautrix_whatsapp_postgres_password }}@{{ matrix_mautrix_whatsapp_postgres_hostname }}:{{ matrix_mautrix_whatsapp_postgres_port }}/{{ matrix_mautrix_whatsapp_postgres_db_name }}'
+matrix_mautrix_whatsapp_postgres_connection_string: 'postgresql://{{ matrix_mautrix_whatsapp_database_username }}:{{ matrix_mautrix_whatsapp_database_password }}@{{ matrix_mautrix_whatsapp_postgres_hostname }}:{{ matrix_mautrix_whatsapp_database_port }}/{{ matrix_mautrix_whatsapp_database_db_name }}'
 
 matrix_mautrix_whatsapp_appservice_database_type: "{{
 	{