Rename variables (_database_db_name -> _database_name)

group_vars/matrix_servers

@@ -999,55 +999,55 @@ matrix_postgres_db_name: "homeserver"
 matrix_postgres_additional_databases: |
   {{
     ([{
-      'name': matrix_ma1sd_database_db_name,
+      'name': matrix_ma1sd_database_name,
       'username': matrix_ma1sd_database_username,
       'password': matrix_ma1sd_database_password,
     }] if (matrix_ma1sd_enabled and matrix_ma1sd_database_engine == 'postgres' and matrix_ma1sd_database_hostname == 'matrix-postgres') else [])
     +
     ([{
-      'name': matrix_bot_matrix_reminder_bot_database_db_name,
+      'name': matrix_bot_matrix_reminder_bot_database_name,
       'username': matrix_bot_matrix_reminder_bot_database_username,
       'password': matrix_bot_matrix_reminder_bot_database_password,
     }] if (matrix_bot_matrix_reminder_bot_enabled and matrix_bot_matrix_reminder_bot_database_engine == 'postgres' and matrix_bot_matrix_reminder_bot_database_hostname == 'matrix-postgres') else [])
     +
     ([{
-      'name': matrix_registration_database_db_name,
+      'name': matrix_registration_database_name,
       'username': matrix_registration_database_username,
       'password': matrix_registration_database_password,
     }] if (matrix_registration_enabled and matrix_registration_database_engine == 'postgres' and matrix_registration_database_hostname == 'matrix-postgres') else [])
     +
     ([{
-      'name': matrix_appservice_discord_database_db_name,
+      'name': matrix_appservice_discord_database_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_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_appservice_slack_database_db_name,
+      'name': matrix_appservice_slack_database_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_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_appservice_irc_database_db_name,
+      'name': matrix_appservice_irc_database_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_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_facebook_database_db_name,
+      'name': matrix_mautrix_facebook_database_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_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_hangouts_database_db_name,
+      'name': matrix_mautrix_hangouts_database_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_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_telegram_database_db_name,
+      'name': matrix_mautrix_telegram_database_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_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mautrix_whatsapp_database_db_name,
+      'name': matrix_mautrix_whatsapp_database_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_database_hostname == 'matrix-postgres') else [])
@@ -1057,36 +1057,36 @@ 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_database_db_name,
+      'name': matrix_mx_puppet_skype_database_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_database_hostname == 'matrix-postgres') else [])
     + ([{
-      'name': matrix_mx_puppet_slack_database_db_name,
+      'name': matrix_mx_puppet_slack_database_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_database_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_twitter_database_db_name,
+      'name': matrix_mx_puppet_twitter_database_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_database_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_instagram_database_db_name,
+      'name': matrix_mx_puppet_instagram_database_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_database_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_discord_database_db_name,
+      'name': matrix_mx_puppet_discord_database_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_database_hostname == 'matrix-postgres') else [])
      + ([{
-      'name': matrix_mx_puppet_steam_database_db_name,
+      'name': matrix_mx_puppet_steam_database_name,
       'username': matrix_mx_puppet_steam_database_username,
       'password': matrix_mx_puppet_steam_database_password,
     }] if (matrix_mx_puppet_steam_enabled
@@ -1094,7 +1094,7 @@ matrix_postgres_additional_databases: |
            and matrix_mx_puppet_steam_database_hostname == 'matrix-postgres') else [])
      +
     ([{
-      'name': matrix_dimension_database_db_name,
+      'name': matrix_dimension_database_name,
       'username': matrix_dimension_database_username,
       'password': matrix_dimension_database_password,
     }] if (matrix_dimension_enabled and matrix_dimension_database_engine == 'postgres' and matrix_dimension_database_hostname == 'matrix-postgres') else [])

roles/matrix-bot-matrix-reminder-bot/defaults/main.yml

@@ -37,9 +37,9 @@ matrix_bot_matrix_reminder_bot_database_username: 'matrix_reminder_bot'
 matrix_bot_matrix_reminder_bot_database_password: 'some-password'
 matrix_bot_matrix_reminder_bot_database_hostname: 'matrix-postgres'
 matrix_bot_matrix_reminder_bot_database_port: 5432
-matrix_bot_matrix_reminder_bot_database_db_name: 'matrix_reminder_bot'
+matrix_bot_matrix_reminder_bot_database_name: 'matrix_reminder_bot'
 
-matrix_bot_matrix_reminder_bot_database_connection_string: 'postgres://{{ matrix_bot_matrix_reminder_bot_database_username }}:{{ matrix_bot_matrix_reminder_bot_database_password }}@{{ matrix_bot_matrix_reminder_bot_database_hostname }}:{{ matrix_bot_matrix_reminder_bot_database_port }}/{{ matrix_bot_matrix_reminder_bot_database_db_name }}'
+matrix_bot_matrix_reminder_bot_database_connection_string: 'postgres://{{ matrix_bot_matrix_reminder_bot_database_username }}:{{ matrix_bot_matrix_reminder_bot_database_password }}@{{ matrix_bot_matrix_reminder_bot_database_hostname }}:{{ matrix_bot_matrix_reminder_bot_database_port }}/{{ matrix_bot_matrix_reminder_bot_database_name }}'
 
 matrix_bot_matrix_reminder_bot_storage_database: "{{
 	{

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

@@ -57,12 +57,12 @@ matrix_appservice_discord_database_username: 'matrix_appservice_discord'
 matrix_appservice_discord_database_password: 'some-password'
 matrix_appservice_discord_database_hostname: 'matrix-postgres'
 matrix_appservice_discord_database_port: 5432
-matrix_appservice_discord_database_db_name: 'matrix_appservice_discord'
+matrix_appservice_discord_database_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_database_username }}:{{ matrix_appservice_discord_database_password }}@{{ matrix_appservice_discord_database_hostname }}:{{ matrix_appservice_discord_database_port }}/{{ matrix_appservice_discord_database_db_name }}'
+matrix_appservice_discord_database_connString: 'postgresql://{{ matrix_appservice_discord_database_username }}:{{ matrix_appservice_discord_database_password }}@{{ matrix_appservice_discord_database_hostname }}:{{ matrix_appservice_discord_database_port }}/{{ matrix_appservice_discord_database_name }}'
 
 
 # Tells whether the bot should make use of "Privileged Gateway Intents".

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

@@ -49,9 +49,9 @@ matrix_mautrix_facebook_database_username: 'matrix_mautrix_facebook'
 matrix_mautrix_facebook_database_password: 'some-password'
 matrix_mautrix_facebook_database_hostname: 'matrix-postgres'
 matrix_mautrix_facebook_database_port: 5432
-matrix_mautrix_facebook_database_db_name: 'matrix_mautrix_facebook'
+matrix_mautrix_facebook_database_name: 'matrix_mautrix_facebook'
 
-matrix_mautrix_facebook_database_connection_string: 'postgresql://{{ matrix_mautrix_facebook_database_username }}:{{ matrix_mautrix_facebook_database_password }}@{{ matrix_mautrix_facebook_database_hostname }}:{{ matrix_mautrix_facebook_database_port }}/{{ matrix_mautrix_facebook_database_db_name }}'
+matrix_mautrix_facebook_database_connection_string: 'postgresql://{{ matrix_mautrix_facebook_database_username }}:{{ matrix_mautrix_facebook_database_password }}@{{ matrix_mautrix_facebook_database_hostname }}:{{ matrix_mautrix_facebook_database_port }}/{{ matrix_mautrix_facebook_database_name }}'
 
 matrix_mautrix_facebook_appservice_database: "{{
 	{

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

@@ -56,9 +56,9 @@ matrix_mautrix_hangouts_database_username: 'matrix_mautrix_hangouts'
 matrix_mautrix_hangouts_database_password: 'some-password'
 matrix_mautrix_hangouts_database_hostname: 'matrix-postgres'
 matrix_mautrix_hangouts_database_port: 5432
-matrix_mautrix_hangouts_database_db_name: 'matrix_mautrix_hangouts'
+matrix_mautrix_hangouts_database_name: 'matrix_mautrix_hangouts'
 
-matrix_mautrix_hangouts_database_connection_string: 'postgresql://{{ matrix_mautrix_hangouts_database_username }}:{{ matrix_mautrix_hangouts_database_password }}@{{ matrix_mautrix_hangouts_database_hostname }}:{{ matrix_mautrix_hangouts_database_port }}/{{ matrix_mautrix_hangouts_database_db_name }}'
+matrix_mautrix_hangouts_database_connection_string: 'postgresql://{{ matrix_mautrix_hangouts_database_username }}:{{ matrix_mautrix_hangouts_database_password }}@{{ matrix_mautrix_hangouts_database_hostname }}:{{ matrix_mautrix_hangouts_database_port }}/{{ matrix_mautrix_hangouts_database_name }}'
 
 matrix_mautrix_hangouts_appservice_database: "{{
 	{

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

@@ -60,9 +60,9 @@ matrix_mautrix_telegram_database_username: 'matrix_mautrix_telegram'
 matrix_mautrix_telegram_database_password: 'some-password'
 matrix_mautrix_telegram_database_hostname: 'matrix-postgres'
 matrix_mautrix_telegram_database_port: 5432
-matrix_mautrix_telegram_database_db_name: 'matrix_mautrix_telegram'
+matrix_mautrix_telegram_database_name: 'matrix_mautrix_telegram'
 
-matrix_mautrix_telegram_database_connection_string: 'postgresql://{{ matrix_mautrix_telegram_database_username }}:{{ matrix_mautrix_telegram_database_password }}@{{ matrix_mautrix_telegram_database_hostname }}:{{ matrix_mautrix_telegram_database_port }}/{{ matrix_mautrix_telegram_database_db_name }}'
+matrix_mautrix_telegram_database_connection_string: 'postgresql://{{ matrix_mautrix_telegram_database_username }}:{{ matrix_mautrix_telegram_database_password }}@{{ matrix_mautrix_telegram_database_hostname }}:{{ matrix_mautrix_telegram_database_port }}/{{ matrix_mautrix_telegram_database_name }}'
 
 matrix_mautrix_telegram_appservice_database: "{{
 	{

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

@@ -44,9 +44,9 @@ matrix_mautrix_whatsapp_database_username: 'matrix_mautrix_whatsapp'
 matrix_mautrix_whatsapp_database_password: 'some-password'
 matrix_mautrix_whatsapp_database_hostname: 'matrix-postgres'
 matrix_mautrix_whatsapp_database_port: 5432
-matrix_mautrix_whatsapp_database_db_name: 'matrix_mautrix_whatsapp'
+matrix_mautrix_whatsapp_database_name: 'matrix_mautrix_whatsapp'
 
-matrix_mautrix_whatsapp_database_connection_string: 'postgresql://{{ matrix_mautrix_whatsapp_database_username }}:{{ matrix_mautrix_whatsapp_database_password }}@{{ matrix_mautrix_whatsapp_database_hostname }}:{{ matrix_mautrix_whatsapp_database_port }}/{{ matrix_mautrix_whatsapp_database_db_name }}'
+matrix_mautrix_whatsapp_database_connection_string: 'postgresql://{{ matrix_mautrix_whatsapp_database_username }}:{{ matrix_mautrix_whatsapp_database_password }}@{{ matrix_mautrix_whatsapp_database_hostname }}:{{ matrix_mautrix_whatsapp_database_port }}/{{ matrix_mautrix_whatsapp_database_name }}'
 
 matrix_mautrix_whatsapp_appservice_database_type: "{{
 	{

roles/matrix-bridge-mx-puppet-discord/defaults/main.yml

@@ -65,9 +65,9 @@ matrix_mx_puppet_discord_database_username: matrix_mx_puppet_discord
 matrix_mx_puppet_discord_database_password: ~
 matrix_mx_puppet_discord_database_hostname: 'matrix-postgres'
 matrix_mx_puppet_discord_database_port: 5432
-matrix_mx_puppet_discord_database_db_name: matrix_mx_puppet_discord
+matrix_mx_puppet_discord_database_name: matrix_mx_puppet_discord
 
-matrix_mx_puppet_discord_database_connection_string: 'postgresql://{{ matrix_mx_puppet_discord_database_username }}:{{ matrix_mx_puppet_discord_database_password }}@{{ matrix_mx_puppet_discord_database_hostname }}:{{ matrix_mx_puppet_discord_database_port }}/{{ matrix_mx_puppet_discord_database_db_name }}?sslmode=disable'
+matrix_mx_puppet_discord_database_connection_string: 'postgresql://{{ matrix_mx_puppet_discord_database_username }}:{{ matrix_mx_puppet_discord_database_password }}@{{ matrix_mx_puppet_discord_database_hostname }}:{{ matrix_mx_puppet_discord_database_port }}/{{ matrix_mx_puppet_discord_database_name }}?sslmode=disable'
 
 # Default configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.

roles/matrix-bridge-mx-puppet-instagram/defaults/main.yml

@@ -55,9 +55,9 @@ matrix_mx_puppet_instagram_database_username: matrix_mx_puppet_instagram
 matrix_mx_puppet_instagram_database_password: ~
 matrix_mx_puppet_instagram_database_hostname: 'matrix-postgres'
 matrix_mx_puppet_instagram_database_port: 5432
-matrix_mx_puppet_instagram_database_db_name: matrix_mx_puppet_instagram
+matrix_mx_puppet_instagram_database_name: matrix_mx_puppet_instagram
 
-matrix_mx_puppet_instagram_database_connection_string: 'postgresql://{{ matrix_mx_puppet_instagram_database_username }}:{{ matrix_mx_puppet_instagram_database_password }}@{{ matrix_mx_puppet_instagram_database_hostname }}:{{ matrix_mx_puppet_instagram_database_port }}/{{ matrix_mx_puppet_instagram_database_db_name }}?sslmode=disable'
+matrix_mx_puppet_instagram_database_connection_string: 'postgresql://{{ matrix_mx_puppet_instagram_database_username }}:{{ matrix_mx_puppet_instagram_database_password }}@{{ matrix_mx_puppet_instagram_database_hostname }}:{{ matrix_mx_puppet_instagram_database_port }}/{{ matrix_mx_puppet_instagram_database_name }}?sslmode=disable'
 
 # Default configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.

roles/matrix-bridge-mx-puppet-skype/defaults/main.yml

@@ -63,9 +63,9 @@ matrix_mx_puppet_skype_database_username: matrix_mx_puppet_skype
 matrix_mx_puppet_skype_database_password: ~
 matrix_mx_puppet_skype_database_hostname: 'matrix-postgres'
 matrix_mx_puppet_skype_database_port: 5432
-matrix_mx_puppet_skype_database_db_name: matrix_mx_puppet_skype
+matrix_mx_puppet_skype_database_name: matrix_mx_puppet_skype
 
-matrix_mx_puppet_skype_database_connection_string: 'postgresql://{{ matrix_mx_puppet_skype_database_username }}:{{ matrix_mx_puppet_skype_database_password }}@{{ matrix_mx_puppet_skype_database_hostname }}:{{ matrix_mx_puppet_skype_database_port }}/{{ matrix_mx_puppet_skype_database_db_name }}?sslmode=disable'
+matrix_mx_puppet_skype_database_connection_string: 'postgresql://{{ matrix_mx_puppet_skype_database_username }}:{{ matrix_mx_puppet_skype_database_password }}@{{ matrix_mx_puppet_skype_database_hostname }}:{{ matrix_mx_puppet_skype_database_port }}/{{ matrix_mx_puppet_skype_database_name }}?sslmode=disable'
 
 # Default configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.

roles/matrix-bridge-mx-puppet-slack/defaults/main.yml

@@ -67,9 +67,9 @@ matrix_mx_puppet_slack_database_username: matrix_mx_puppet_slack
 matrix_mx_puppet_slack_database_password: ~
 matrix_mx_puppet_slack_database_hostname: 'matrix-postgres'
 matrix_mx_puppet_slack_database_port: 5432
-matrix_mx_puppet_slack_database_db_name: matrix_mx_puppet_slack
+matrix_mx_puppet_slack_database_name: matrix_mx_puppet_slack
 
-matrix_mx_puppet_slack_database_connection_string: 'postgresql://{{ matrix_mx_puppet_slack_database_username }}:{{ matrix_mx_puppet_slack_database_password }}@{{ matrix_mx_puppet_slack_database_hostname }}:{{ matrix_mx_puppet_slack_database_port }}/{{ matrix_mx_puppet_slack_database_db_name }}?sslmode=disable'
+matrix_mx_puppet_slack_database_connection_string: 'postgresql://{{ matrix_mx_puppet_slack_database_username }}:{{ matrix_mx_puppet_slack_database_password }}@{{ matrix_mx_puppet_slack_database_hostname }}:{{ matrix_mx_puppet_slack_database_port }}/{{ matrix_mx_puppet_slack_database_name }}?sslmode=disable'
 
 # Default configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.

roles/matrix-bridge-mx-puppet-steam/defaults/main.yml

@@ -64,9 +64,9 @@ matrix_mx_puppet_steam_database_username: matrix_mx_puppet_steam
 matrix_mx_puppet_steam_database_password: ~
 matrix_mx_puppet_steam_database_hostname: 'matrix-postgres'
 matrix_mx_puppet_steam_database_port: 5432
-matrix_mx_puppet_steam_database_db_name: matrix_mx_puppet_steam
+matrix_mx_puppet_steam_database_name: matrix_mx_puppet_steam
 
-matrix_mx_puppet_steam_database_connection_string: 'postgresql://{{ matrix_mx_puppet_steam_database_username }}:{{ matrix_mx_puppet_steam_database_password }}@{{ matrix_mx_puppet_steam_database_hostname }}:{{ matrix_mx_puppet_steam_database_port }}/{{ matrix_mx_puppet_steam_database_db_name }}?sslmode=disable'
+matrix_mx_puppet_steam_database_connection_string: 'postgresql://{{ matrix_mx_puppet_steam_database_username }}:{{ matrix_mx_puppet_steam_database_password }}@{{ matrix_mx_puppet_steam_database_hostname }}:{{ matrix_mx_puppet_steam_database_port }}/{{ matrix_mx_puppet_steam_database_name }}?sslmode=disable'
 
 # Default configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.

roles/matrix-bridge-mx-puppet-twitter/defaults/main.yml

@@ -70,9 +70,9 @@ matrix_mx_puppet_twitter_database_username: mx_puppet_twitter
 matrix_mx_puppet_twitter_database_password: ~
 matrix_mx_puppet_twitter_database_hostname: 'matrix-postgres'
 matrix_mx_puppet_twitter_database_port: 5432
-matrix_mx_puppet_twitter_database_db_name: matrix_mx_puppet_twitter
+matrix_mx_puppet_twitter_database_name: matrix_mx_puppet_twitter
 
-matrix_mx_puppet_twitter_database_connection_string: 'postgresql://{{ matrix_mx_puppet_twitter_database_username }}:{{ matrix_mx_puppet_twitter_database_password }}@{{ matrix_mx_puppet_twitter_database_hostname }}:{{ matrix_mx_puppet_twitter_database_port }}/{{ matrix_mx_puppet_twitter_database_db_name }}?sslmode=disable'
+matrix_mx_puppet_twitter_database_connection_string: 'postgresql://{{ matrix_mx_puppet_twitter_database_username }}:{{ matrix_mx_puppet_twitter_database_password }}@{{ matrix_mx_puppet_twitter_database_hostname }}:{{ matrix_mx_puppet_twitter_database_port }}/{{ matrix_mx_puppet_twitter_database_name }}?sslmode=disable'
 
 # Default configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.

roles/matrix-dimension/defaults/main.yml

@@ -57,9 +57,9 @@ matrix_dimension_database_username: 'matrix_dimension'
 matrix_dimension_database_password: 'some-password'
 matrix_dimension_database_hostname: 'matrix-postgres'
 matrix_dimension_database_port: 5432
-matrix_dimension_database_db_name: 'matrix_dimension'
+matrix_dimension_database_name: 'matrix_dimension'
 
-matrix_dimension_database_connection_string: 'postgres://{{ matrix_dimension_database_username }}:{{ matrix_dimension_database_password }}@{{ matrix_dimension_database_hostname }}:{{ matrix_dimension_database_port }}/{{ matrix_dimension_database_db_name }}'
+matrix_dimension_database_connection_string: 'postgres://{{ matrix_dimension_database_username }}:{{ matrix_dimension_database_password }}@{{ matrix_dimension_database_hostname }}:{{ matrix_dimension_database_port }}/{{ matrix_dimension_database_name }}'
 
 
 # Default Dimension configuration template which covers the generic use case.

roles/matrix-ma1sd/defaults/main.yml

@@ -56,9 +56,9 @@ matrix_ma1sd_database_username: 'matrix_ma1sd'
 matrix_ma1sd_database_password: 'some-password'
 matrix_ma1sd_database_hostname: 'matrix-postgres'
 matrix_ma1sd_database_port: 5432
-matrix_ma1sd_database_db_name: 'matrix_ma1sd'
+matrix_ma1sd_database_name: 'matrix_ma1sd'
 
-matrix_ma1sd_database_connection_string: 'postgresql://{{ matrix_ma1sd_database_username }}:{{ matrix_ma1sd_database_password }}@{{ matrix_ma1sd_database_hostname }}:{{ matrix_ma1sd_database_port }}/{{ matrix_ma1sd_database_db_name }}'
+matrix_ma1sd_database_connection_string: 'postgresql://{{ matrix_ma1sd_database_username }}:{{ matrix_ma1sd_database_password }}@{{ matrix_ma1sd_database_hostname }}:{{ matrix_ma1sd_database_port }}/{{ matrix_ma1sd_database_name }}'
 
 
 # ma1sd has serveral supported identity stores.

roles/matrix-ma1sd/templates/ma1sd.yaml.j2

@@ -20,7 +20,7 @@ storage:
     backend: postgresql
     provider:
       postgresql:
-        database: //{{ matrix_ma1sd_database_hostname }}:{{ matrix_ma1sd_database_port }}/{{ matrix_ma1sd_database_db_name }}
+        database: //{{ matrix_ma1sd_database_hostname }}:{{ matrix_ma1sd_database_port }}/{{ matrix_ma1sd_database_name }}
         username: {{ matrix_ma1sd_database_username|to_json }}
         password: {{ matrix_ma1sd_database_password|to_json }}
   {% endif %}

roles/matrix-registration/defaults/main.yml

@@ -48,9 +48,9 @@ matrix_registration_database_username: 'matrix_registration'
 matrix_registration_database_password: 'some-password'
 matrix_registration_database_hostname: 'matrix-postgres'
 matrix_registration_database_port: 5432
-matrix_registration_database_db_name: 'matrix_registration'
+matrix_registration_database_name: 'matrix_registration'
 
-matrix_registration_database_connection_string: 'postgresql://{{ matrix_registration_database_username }}:{{ matrix_registration_database_password }}@{{ matrix_registration_database_hostname }}:{{ matrix_registration_database_port }}/{{ matrix_registration_database_db_name }}'
+matrix_registration_database_connection_string: 'postgresql://{{ matrix_registration_database_username }}:{{ matrix_registration_database_password }}@{{ matrix_registration_database_hostname }}:{{ matrix_registration_database_port }}/{{ matrix_registration_database_name }}'
 
 # For some reason, matrix-registraiton expects the `db` field to be like this: `sqlite:////data/db.sqlite3`.
 # (seems like one too many slashes, but..)

roles/matrix-registration/tasks/setup_install.yml

@@ -22,7 +22,7 @@
               # which makes matrix-registration choke on it later on when comparing dates.
               additional_psql_statements_list:
                 - ALTER TABLE tokens ALTER COLUMN ex_date TYPE TIMESTAMP WITHOUT TIME ZONE;
-              additional_psql_statements_db_name: "{{ matrix_registration_database_db_name }}"
+              additional_psql_statements_db_name: "{{ matrix_registration_database_name }}"
 
         - import_tasks: "roles/matrix-postgres/tasks/util/migrate_db_to_postgres.yml"