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.
This commit is contained in:
Slavi Pantaleev
2020-12-14 13:02:47 +02:00
parent ce21ea3640
commit 087dbe4ddc
6 changed files with 81 additions and 81 deletions

View File

@ -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".

View File

@ -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: "{{
{

View File

@ -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: "{{
{

View File

@ -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: "{{
{

View File

@ -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: "{{
{