Rename Postgres-related variables (`matrix*database_*` -> `matrix*postgres_*`)

`matrix_SERVICE_database_engine` remains as it is - the only one with a
`_database_` infix. Postgres-related ones move to `_postgres_`.
development
Slavi Pantaleev 4 years ago
parent c0edacbefd
commit 2a99e84b5b

@ -955,14 +955,14 @@ matrix_postgres_additional_databases: |
'password': matrix_appservice_discord_postgres_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_database_db_name,
'username': matrix_appservice_slack_database_username,
'password': matrix_appservice_slack_database_password,
'name': matrix_appservice_slack_postgres_db_name,
'username': matrix_appservice_slack_postgres_username,
'password': matrix_appservice_slack_postgres_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,
'username': matrix_appservice_irc_database_username,
'password': matrix_appservice_irc_database_password,
'name': matrix_appservice_irc_postgres_db_name,
'username': matrix_appservice_irc_postgres_username,
'password': matrix_appservice_irc_postgres_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_postgres_db_name,
@ -970,19 +970,19 @@ matrix_postgres_additional_databases: |
'password': matrix_mautrix_facebook_postgres_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_database_db_name,
'username': matrix_mautrix_hangouts_database_username,
'password': matrix_mautrix_hangouts_database_password,
'name': matrix_mautrix_hangouts_postgres_db_name,
'username': matrix_mautrix_hangouts_postgres_username,
'password': matrix_mautrix_hangouts_postgres_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,
'username': matrix_mautrix_telegram_database_username,
'password': matrix_mautrix_telegram_database_password,
'name': matrix_mautrix_telegram_postgres_db_name,
'username': matrix_mautrix_telegram_postgres_username,
'password': matrix_mautrix_telegram_postgres_password,
}] if (matrix_mautrix_telegram_enabled and matrix_mautrix_telegram_database_engine == 'postgres' and matrix_telegram_facebook_database_hostname == 'matrix-postgres') else [])
+ ([{
'name': matrix_mautrix_whatsapp_database_db_name,
'username': matrix_mautrix_whatsapp_database_username,
'password': matrix_mautrix_whatsapp_database_password,
'name': matrix_mautrix_whatsapp_postgres_db_name,
'username': matrix_mautrix_whatsapp_postgres_username,
'password': matrix_mautrix_whatsapp_postgres_password,
}] if (matrix_mautrix_whatsapp_enabled and matrix_mautrix_whatsapp_database_engine == 'postgres' and matrix_mautrix_whatsapp_database_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_database_db_name,
'username': matrix_mx_puppet_skype_database_username,
'password': matrix_mx_puppet_skype_database_password,
'name': matrix_mx_puppet_skype_postgres_db_name,
'username': matrix_mx_puppet_skype_postgres_username,
'password': matrix_mx_puppet_skype_postgres_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,
'username': matrix_mx_puppet_slack_database_username,
'password': matrix_mx_puppet_slack_database_password,
'name': matrix_mx_puppet_slack_postgres_db_name,
'username': matrix_mx_puppet_slack_postgres_username,
'password': matrix_mx_puppet_slack_postgres_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,
'username': matrix_mx_puppet_twitter_database_username,
'password': matrix_mx_puppet_twitter_database_password,
'name': matrix_mx_puppet_twitter_postgres_db_name,
'username': matrix_mx_puppet_twitter_postgres_username,
'password': matrix_mx_puppet_twitter_postgres_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,
'username': matrix_mx_puppet_instagram_database_username,
'password': matrix_mx_puppet_instagram_database_password,
'name': matrix_mx_puppet_instagram_postgres_db_name,
'username': matrix_mx_puppet_instagram_postgres_username,
'password': matrix_mx_puppet_instagram_postgres_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,
'username': matrix_mx_puppet_discord_database_username,
'password': matrix_mx_puppet_discord_database_password,
'name': matrix_mx_puppet_discord_postgres_db_name,
'username': matrix_mx_puppet_discord_postgres_username,
'password': matrix_mx_puppet_discord_postgres_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,
'username': matrix_mx_puppet_steam_database_username,
'password': matrix_mx_puppet_steam_database_password,
'name': matrix_mx_puppet_steam_postgres_db_name,
'username': matrix_mx_puppet_steam_postgres_username,
'password': matrix_mx_puppet_steam_postgres_password,
}] if (matrix_mx_puppet_steam_enabled
and matrix_mx_puppet_steam_database_engine == 'postgres'
and matrix_mx_puppet_steam_database_hostname == 'matrix-postgres') else [])
+ ([{
'name': matrix_dimension_database_db_name,
'username': matrix_dimension_database_username,
'password': matrix_dimension_database_password,
'name': matrix_dimension_postgres_db_name,
'username': matrix_dimension_postgres_username,
'password': matrix_dimension_postgres_password,
}] if (matrix_dimension_enabled
and matrix_dimension_database_engine == 'postgres'
and matrix_dimension_database_hostname == 'matrix-postgres') else [])

Loading…
Cancel
Save