From e0bc2be68707cbc8580580e87ea7ad8220702498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Fri, 24 Apr 2026 09:01:47 +0300 Subject: [PATCH] Clean up ansible-lint warnings in defaults/main.yml files (#5148) Reformat `{{ { ... }[engine] }}` dict-in-Jinja-expressions across bot/bridge role defaults for consistent indentation (tabs -> spaces). Also: fix a missing space in a Jinja `+` expression in matrix-static-files, and fix indentation in the caddy2-in-container example. The original PR also renamed `galaxy/` role references to just `` in setup.yml and jitsi_jvb.yml; those were dropped here because Ansible does not recurse into subdirectories of `roles/` by default and no `roles_path` is configured in ansible.cfg, so the rename would break role resolution. Co-Authored-By: Slavi Pantaleev --- .../caddy2-in-container/docker-compose.yaml | 2 +- .../matrix-bot-buscarron/defaults/main.yml | 16 ++++++--------- .../matrix-bot-go-neb/defaults/main.yml | 8 +++----- .../matrix-bot-honoroit/defaults/main.yml | 16 ++++++--------- .../defaults/main.yml | 10 ++++------ .../matrix-bot-maubot/defaults/main.yml | 10 ++++------ .../defaults/main.yml | 10 ++++------ .../defaults/main.yml | 16 ++++++--------- .../defaults/main.yml | 8 +++----- .../defaults/main.yml | 20 ++++++++----------- .../defaults/main.yml | 20 ++++++++----------- .../defaults/main.yml | 10 ++++------ .../defaults/main.yml | 20 ++++++++----------- .../defaults/main.yml | 20 ++++++++----------- .../defaults/main.yml | 20 ++++++++----------- .../defaults/main.yml | 8 +++----- .../defaults/main.yml | 20 ++++++++----------- .../defaults/main.yml | 16 ++++++--------- .../matrix-bridge-steam/defaults/main.yml | 8 +++----- .../matrix-registration/defaults/main.yml | 10 ++++------ .../matrix-static-files/defaults/main.yml | 2 +- 21 files changed, 106 insertions(+), 164 deletions(-) diff --git a/examples/reverse-proxies/caddy2-in-container/docker-compose.yaml b/examples/reverse-proxies/caddy2-in-container/docker-compose.yaml index d497660f9..ce20ba41b 100644 --- a/examples/reverse-proxies/caddy2-in-container/docker-compose.yaml +++ b/examples/reverse-proxies/caddy2-in-container/docker-compose.yaml @@ -19,7 +19,7 @@ services: volumes: - ./Caddyfile:/etc/caddy/Caddyfile # - ./site:/var/www - # Other configurations … + # Other configurations … networks: # add this as well diff --git a/roles/custom/matrix-bot-buscarron/defaults/main.yml b/roles/custom/matrix-bot-buscarron/defaults/main.yml index 3da905392..b2a08019b 100644 --- a/roles/custom/matrix-bot-buscarron/defaults/main.yml +++ b/roles/custom/matrix-bot-buscarron/defaults/main.yml @@ -137,19 +137,15 @@ matrix_bot_buscarron_database_sslmode: disable matrix_bot_buscarron_database_connection_string: 'postgres://{{ matrix_bot_buscarron_database_username }}:{{ matrix_bot_buscarron_database_password }}@{{ matrix_bot_buscarron_database_hostname }}:{{ matrix_bot_buscarron_database_port }}/{{ matrix_bot_buscarron_database_name }}?sslmode={{ matrix_bot_buscarron_database_sslmode }}' -matrix_bot_buscarron_storage_database: "{{ - { - 'sqlite': matrix_bot_buscarron_sqlite_database_path_in_container, - 'postgres': matrix_bot_buscarron_database_connection_string, - }[matrix_bot_buscarron_database_engine] -}}" +matrix_bot_buscarron_storage_database: "{{ { + 'sqlite': matrix_bot_buscarron_sqlite_database_path_in_container, + 'postgres': matrix_bot_buscarron_database_connection_string, +}[matrix_bot_buscarron_database_engine] }}" -matrix_bot_buscarron_database_dialect: "{{ - { +matrix_bot_buscarron_database_dialect: "{{ { 'sqlite': 'sqlite3', 'postgres': 'postgres', - }[matrix_bot_buscarron_database_engine] -}}" +}[matrix_bot_buscarron_database_engine] }}" # The bot's username. This user needs to be created manually beforehand. diff --git a/roles/custom/matrix-bot-go-neb/defaults/main.yml b/roles/custom/matrix-bot-go-neb/defaults/main.yml index 556bb39dd..54d438147 100644 --- a/roles/custom/matrix-bot-go-neb/defaults/main.yml +++ b/roles/custom/matrix-bot-go-neb/defaults/main.yml @@ -159,11 +159,9 @@ matrix_bot_go_neb_database_engine: 'sqlite3' matrix_bot_go_neb_sqlite_database_path_local: "{{ matrix_bot_go_neb_data_path }}/bot.db" matrix_bot_go_neb_sqlite_database_path_in_container: "/data/bot.db" -matrix_bot_go_neb_storage_database: "{{ - { - 'sqlite3': (matrix_bot_go_neb_sqlite_database_path_in_container + '?_busy_timeout=5000'), - }[matrix_bot_go_neb_database_engine] -}}" +matrix_bot_go_neb_storage_database: "{{ { + 'sqlite3': (matrix_bot_go_neb_sqlite_database_path_in_container + '?_busy_timeout=5000'), +}[matrix_bot_go_neb_database_engine] }}" # The bot's username(s). These users need to be created manually beforehand. # The access tokens that the bot uses to authenticate. diff --git a/roles/custom/matrix-bot-honoroit/defaults/main.yml b/roles/custom/matrix-bot-honoroit/defaults/main.yml index b97f0f4b7..c38416167 100644 --- a/roles/custom/matrix-bot-honoroit/defaults/main.yml +++ b/roles/custom/matrix-bot-honoroit/defaults/main.yml @@ -115,19 +115,15 @@ matrix_bot_honoroit_database_sslmode: disable matrix_bot_honoroit_database_connection_string: 'postgres://{{ matrix_bot_honoroit_database_username }}:{{ matrix_bot_honoroit_database_password }}@{{ matrix_bot_honoroit_database_hostname }}:{{ matrix_bot_honoroit_database_port }}/{{ matrix_bot_honoroit_database_name }}?sslmode={{ matrix_bot_honoroit_database_sslmode }}' -matrix_bot_honoroit_storage_database: "{{ - { - 'sqlite': matrix_bot_honoroit_sqlite_database_path_in_container, - 'postgres': matrix_bot_honoroit_database_connection_string, - }[matrix_bot_honoroit_database_engine] -}}" +matrix_bot_honoroit_storage_database: "{{ { + 'sqlite': matrix_bot_honoroit_sqlite_database_path_in_container, + 'postgres': matrix_bot_honoroit_database_connection_string, +}[matrix_bot_honoroit_database_engine] }}" -matrix_bot_honoroit_database_dialect: "{{ - { +matrix_bot_honoroit_database_dialect: "{{ { 'sqlite': 'sqlite3', 'postgres': 'postgres', - }[matrix_bot_honoroit_database_engine] -}}" +}[matrix_bot_honoroit_database_engine] }}" # The bot's username. This user needs to be created manually beforehand. diff --git a/roles/custom/matrix-bot-matrix-reminder-bot/defaults/main.yml b/roles/custom/matrix-bot-matrix-reminder-bot/defaults/main.yml index c4f14fe2b..638017be5 100644 --- a/roles/custom/matrix-bot-matrix-reminder-bot/defaults/main.yml +++ b/roles/custom/matrix-bot-matrix-reminder-bot/defaults/main.yml @@ -72,12 +72,10 @@ 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_name }}' -matrix_bot_matrix_reminder_bot_storage_database: "{{ - { - 'sqlite': ('sqlite://' + matrix_bot_matrix_reminder_bot_sqlite_database_path_in_container), - 'postgres': matrix_bot_matrix_reminder_bot_database_connection_string, - }[matrix_bot_matrix_reminder_bot_database_engine] -}}" +matrix_bot_matrix_reminder_bot_storage_database: "{{ { + 'sqlite': ('sqlite://' + matrix_bot_matrix_reminder_bot_sqlite_database_path_in_container), + 'postgres': matrix_bot_matrix_reminder_bot_database_connection_string, +}[matrix_bot_matrix_reminder_bot_database_engine] }}" # The bot's username. This user needs to be created manually beforehand. diff --git a/roles/custom/matrix-bot-maubot/defaults/main.yml b/roles/custom/matrix-bot-maubot/defaults/main.yml index 045761599..c8a02f478 100644 --- a/roles/custom/matrix-bot-maubot/defaults/main.yml +++ b/roles/custom/matrix-bot-maubot/defaults/main.yml @@ -79,12 +79,10 @@ matrix_bot_maubot_database_sslmode: disable matrix_bot_maubot_database_connection_string: postgres://{{ matrix_bot_maubot_database_username }}:{{ matrix_bot_maubot_database_password }}@{{ matrix_bot_maubot_database_hostname }}:{{ matrix_bot_maubot_database_port }}/{{ matrix_bot_maubot_database_name }}?sslmode={{ matrix_bot_maubot_database_sslmode }} -matrix_bot_maubot_database_uri: "{{ - { - 'sqlite': ('sqlite:///' + matrix_bot_maubot_sqlite_database_path_in_container), - 'postgres': matrix_bot_maubot_database_connection_string, - }[matrix_bot_maubot_database_engine] - }}" +matrix_bot_maubot_database_uri: "{{ { + 'sqlite': ('sqlite:///' + matrix_bot_maubot_sqlite_database_path_in_container), + 'postgres': matrix_bot_maubot_database_connection_string, +}[matrix_bot_maubot_database_engine] }}" # Defines the port number where the management interface is # To actually expose the management interface outside of the container, use `matrix_bot_maubot_container_management_interface_http_bind_port` diff --git a/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml b/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml index d680a7424..f39c7d24f 100644 --- a/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml +++ b/roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml @@ -121,12 +121,10 @@ matrix_appservice_kakaotalk_database_name: 'matrix_appservice_kakaotalk' matrix_appservice_kakaotalk_database_connection_string: 'postgres://{{ matrix_appservice_kakaotalk_database_username }}:{{ matrix_appservice_kakaotalk_database_password }}@{{ matrix_appservice_kakaotalk_database_hostname }}:{{ matrix_appservice_kakaotalk_database_port }}/{{ matrix_appservice_kakaotalk_database_name }}' -matrix_appservice_kakaotalk_appservice_database: "{{ - { - 'sqlite': ('sqlite:///' + matrix_appservice_kakaotalk_sqlite_database_path_in_container), - 'postgres': matrix_appservice_kakaotalk_database_connection_string, - }[matrix_appservice_kakaotalk_database_engine] -}}" +matrix_appservice_kakaotalk_appservice_database: "{{ { + 'sqlite': ('sqlite:///' + matrix_appservice_kakaotalk_sqlite_database_path_in_container), + 'postgres': matrix_appservice_kakaotalk_database_connection_string, +}[matrix_appservice_kakaotalk_database_engine] }}" # Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth). diff --git a/roles/custom/matrix-bridge-beeper-linkedin/defaults/main.yml b/roles/custom/matrix-bridge-beeper-linkedin/defaults/main.yml index bdec9b099..e9474ba60 100644 --- a/roles/custom/matrix-bridge-beeper-linkedin/defaults/main.yml +++ b/roles/custom/matrix-bridge-beeper-linkedin/defaults/main.yml @@ -92,17 +92,13 @@ matrix_beeper_linkedin_database_sslmode: disable matrix_beeper_linkedin_database_connection_string: 'postgresql://{{ matrix_beeper_linkedin_database_username }}:{{ matrix_beeper_linkedin_database_password }}@{{ matrix_beeper_linkedin_database_hostname }}:{{ matrix_beeper_linkedin_database_port }}/{{ matrix_beeper_linkedin_database_name }}?sslmode={{ matrix_beeper_linkedin_database_sslmode }}' -matrix_beeper_linkedin_appservice_database_type: "{{ - { - 'postgres':'postgres', - }[matrix_beeper_linkedin_database_engine] -}}" +matrix_beeper_linkedin_appservice_database_type: "{{ { + 'postgres': 'postgres', +}[matrix_beeper_linkedin_database_engine] }}" -matrix_beeper_linkedin_appservice_database_uri: "{{ - { - 'postgres': matrix_beeper_linkedin_database_connection_string, - }[matrix_beeper_linkedin_database_engine] -}}" +matrix_beeper_linkedin_appservice_database_uri: "{{ { + 'postgres': matrix_beeper_linkedin_database_connection_string, +}[matrix_beeper_linkedin_database_engine] }}" matrix_beeper_linkedin_bridge_login_shared_secret_map: "{{ matrix_beeper_linkedin_bridge_login_shared_secret_map_auto | combine(matrix_beeper_linkedin_bridge_login_shared_secret_map_custom) }}" matrix_beeper_linkedin_bridge_login_shared_secret_map_auto: {} diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml index 12dd8e639..a402c9083 100644 --- a/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml @@ -122,11 +122,9 @@ matrix_mautrix_bluesky_database_sslmode: disable matrix_mautrix_bluesky_database_connection_string: 'postgres://{{ matrix_mautrix_bluesky_database_username }}:{{ matrix_mautrix_bluesky_database_password }}@{{ matrix_mautrix_bluesky_database_hostname }}:{{ matrix_mautrix_bluesky_database_port }}/{{ matrix_mautrix_bluesky_database_name }}?sslmode={{ matrix_mautrix_bluesky_database_sslmode }}' -matrix_mautrix_bluesky_database_uri: "{{ - { - 'postgres': matrix_mautrix_bluesky_database_connection_string, - }[matrix_mautrix_bluesky_database_engine] -}}" +matrix_mautrix_bluesky_database_uri: "{{ { + 'postgres': matrix_mautrix_bluesky_database_connection_string, +}[matrix_mautrix_bluesky_database_engine] }}" matrix_mautrix_bluesky_double_puppet_secrets: "{{ matrix_mautrix_bluesky_double_puppet_secrets_auto | combine(matrix_mautrix_bluesky_double_puppet_secrets_custom) }}" matrix_mautrix_bluesky_double_puppet_secrets_auto: {} diff --git a/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml index 1d3ca6883..f9f060dc7 100644 --- a/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml @@ -161,19 +161,15 @@ matrix_mautrix_discord_database_sslmode: disable matrix_mautrix_discord_database_connection_string: 'postgresql://{{ matrix_mautrix_discord_database_username }}:{{ matrix_mautrix_discord_database_password }}@{{ matrix_mautrix_discord_database_hostname }}:{{ matrix_mautrix_discord_database_port }}/{{ matrix_mautrix_discord_database_name }}?sslmode={{ matrix_mautrix_discord_database_sslmode }}' -matrix_mautrix_discord_appservice_database_type: "{{ - { - 'sqlite': 'sqlite3', - 'postgres':'postgres', - }[matrix_mautrix_discord_database_engine] -}}" +matrix_mautrix_discord_appservice_database_type: "{{ { + 'sqlite': 'sqlite3', + 'postgres': 'postgres', +}[matrix_mautrix_discord_database_engine] }}" -matrix_mautrix_discord_appservice_database_uri: "{{ - { - 'sqlite': matrix_mautrix_discord_sqlite_database_path_in_container, - 'postgres': matrix_mautrix_discord_database_connection_string, - }[matrix_mautrix_discord_database_engine] -}}" +matrix_mautrix_discord_appservice_database_uri: "{{ { + 'sqlite': matrix_mautrix_discord_sqlite_database_path_in_container, + 'postgres': matrix_mautrix_discord_database_connection_string, +}[matrix_mautrix_discord_database_engine] }}" matrix_mautrix_discord_bridge_login_shared_secret_map: "{{ matrix_mautrix_discord_bridge_login_shared_secret_map_auto | combine(matrix_mautrix_discord_bridge_login_shared_secret_map_custom) }}" matrix_mautrix_discord_bridge_login_shared_secret_map_auto: {} diff --git a/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml index f86037922..a23c13aae 100644 --- a/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml @@ -141,19 +141,15 @@ matrix_mautrix_gmessages_database_sslmode: disable matrix_mautrix_gmessages_database_connection_string: 'postgresql://{{ matrix_mautrix_gmessages_database_username }}:{{ matrix_mautrix_gmessages_database_password }}@{{ matrix_mautrix_gmessages_database_hostname }}:{{ matrix_mautrix_gmessages_database_port }}/{{ matrix_mautrix_gmessages_database_name }}?sslmode={{ matrix_mautrix_gmessages_database_sslmode }}' -matrix_mautrix_gmessages_appservice_database_type: "{{ - { - 'sqlite': 'sqlite3', - 'postgres':'postgres', - }[matrix_mautrix_gmessages_database_engine] -}}" +matrix_mautrix_gmessages_appservice_database_type: "{{ { + 'sqlite': 'sqlite3', + 'postgres': 'postgres', +}[matrix_mautrix_gmessages_database_engine] }}" -matrix_mautrix_gmessages_appservice_database_uri: "{{ - { - 'sqlite': matrix_mautrix_gmessages_sqlite_database_path_in_container, - 'postgres': matrix_mautrix_gmessages_database_connection_string, - }[matrix_mautrix_gmessages_database_engine] -}}" +matrix_mautrix_gmessages_appservice_database_uri: "{{ { + 'sqlite': matrix_mautrix_gmessages_sqlite_database_path_in_container, + 'postgres': matrix_mautrix_gmessages_database_connection_string, +}[matrix_mautrix_gmessages_database_engine] }}" matrix_mautrix_gmessages_double_puppet_secrets: "{{ matrix_mautrix_gmessages_double_puppet_secrets_auto | combine(matrix_mautrix_gmessages_double_puppet_secrets_custom) }}" matrix_mautrix_gmessages_double_puppet_secrets_auto: {} diff --git a/roles/custom/matrix-bridge-mautrix-googlechat/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-googlechat/defaults/main.yml index e47836b94..79ce14a21 100644 --- a/roles/custom/matrix-bridge-mautrix-googlechat/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-googlechat/defaults/main.yml @@ -146,12 +146,10 @@ matrix_mautrix_googlechat_database_name: 'matrix_mautrix_googlechat' matrix_mautrix_googlechat_database_connection_string: 'postgres://{{ matrix_mautrix_googlechat_database_username }}:{{ matrix_mautrix_googlechat_database_password }}@{{ matrix_mautrix_googlechat_database_hostname }}:{{ matrix_mautrix_googlechat_database_port }}/{{ matrix_mautrix_googlechat_database_name }}' -matrix_mautrix_googlechat_appservice_database: "{{ - { - 'sqlite': ('sqlite:///' + matrix_mautrix_googlechat_sqlite_database_path_in_container), - 'postgres': matrix_mautrix_googlechat_database_connection_string, - }[matrix_mautrix_googlechat_database_engine] -}}" +matrix_mautrix_googlechat_appservice_database: "{{ { + 'sqlite': ('sqlite:///' + matrix_mautrix_googlechat_sqlite_database_path_in_container), + 'postgres': matrix_mautrix_googlechat_database_connection_string, +}[matrix_mautrix_googlechat_database_engine] }}" # Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth) or Appservice Double Puppet. diff --git a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml index 1553ea37c..52a662245 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml @@ -172,19 +172,15 @@ matrix_mautrix_signal_database_sslmode: disable matrix_mautrix_signal_database_connection_string: 'postgresql://{{ matrix_mautrix_signal_database_username }}:{{ matrix_mautrix_signal_database_password }}@{{ matrix_mautrix_signal_database_hostname }}:{{ matrix_mautrix_signal_database_port }}/{{ matrix_mautrix_signal_database_name }}?sslmode={{ matrix_mautrix_signal_database_sslmode }}' -matrix_mautrix_signal_appservice_database_type: "{{ - { - 'sqlite': 'sqlite3-fk-wal', - 'postgres':'postgres', - }[matrix_mautrix_signal_database_engine] -}}" +matrix_mautrix_signal_appservice_database_type: "{{ { + 'sqlite': 'sqlite3-fk-wal', + 'postgres': 'postgres', +}[matrix_mautrix_signal_database_engine] }}" -matrix_mautrix_signal_appservice_database_uri: "{{ - { - 'sqlite': matrix_mautrix_signal_sqlite_database_path_in_container, - 'postgres': matrix_mautrix_signal_database_connection_string, - }[matrix_mautrix_signal_database_engine] -}}" +matrix_mautrix_signal_appservice_database_uri: "{{ { + 'sqlite': matrix_mautrix_signal_sqlite_database_path_in_container, + 'postgres': matrix_mautrix_signal_database_connection_string, +}[matrix_mautrix_signal_database_engine] }}" matrix_mautrix_signal_double_puppet_secrets: "{{ matrix_mautrix_signal_double_puppet_secrets_auto | combine(matrix_mautrix_signal_double_puppet_secrets_custom) }}" matrix_mautrix_signal_double_puppet_secrets_auto: {} diff --git a/roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml index 5572d2dfe..13e85a35d 100644 --- a/roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml @@ -123,19 +123,15 @@ matrix_mautrix_slack_database_sslmode: disable matrix_mautrix_slack_database_connection_string: 'postgresql://{{ matrix_mautrix_slack_database_username }}:{{ matrix_mautrix_slack_database_password }}@{{ matrix_mautrix_slack_database_hostname }}:{{ matrix_mautrix_slack_database_port }}/{{ matrix_mautrix_slack_database_name }}?sslmode={{ matrix_mautrix_slack_database_sslmode }}' -matrix_mautrix_slack_appservice_database_type: "{{ - { - 'sqlite': 'sqlite3', - 'postgres':'postgres', - }[matrix_mautrix_slack_database_engine] -}}" +matrix_mautrix_slack_appservice_database_type: "{{ { + 'sqlite': 'sqlite3', + 'postgres': 'postgres', +}[matrix_mautrix_slack_database_engine] }}" -matrix_mautrix_slack_appservice_database_uri: "{{ - { - 'sqlite': matrix_mautrix_slack_sqlite_database_path_in_container, - 'postgres': matrix_mautrix_slack_database_connection_string, - }[matrix_mautrix_slack_database_engine] -}}" +matrix_mautrix_slack_appservice_database_uri: "{{ { + 'sqlite': matrix_mautrix_slack_sqlite_database_path_in_container, + 'postgres': matrix_mautrix_slack_database_connection_string, +}[matrix_mautrix_slack_database_engine] }}" matrix_mautrix_slack_double_puppet_secrets: "{{ matrix_mautrix_slack_double_puppet_secrets_auto | combine(matrix_mautrix_slack_double_puppet_secrets_custom) }}" matrix_mautrix_slack_double_puppet_secrets_auto: {} diff --git a/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml index 117d51b09..97ec372f8 100644 --- a/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml @@ -147,19 +147,15 @@ matrix_mautrix_telegram_database_sslmode: disable 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 }}?sslmode={{ matrix_mautrix_telegram_database_sslmode }}' -matrix_mautrix_telegram_appservice_database_type: "{{ - { - 'sqlite': 'sqlite3-fk-wal', - 'postgres':'postgres', - }[matrix_mautrix_telegram_database_engine] -}}" +matrix_mautrix_telegram_appservice_database_type: "{{ { + 'sqlite': 'sqlite3-fk-wal', + 'postgres': 'postgres', +}[matrix_mautrix_telegram_database_engine] }}" -matrix_mautrix_telegram_appservice_database_uri: "{{ - { - 'sqlite': matrix_mautrix_telegram_sqlite_database_path_in_container, - 'postgres': matrix_mautrix_telegram_database_connection_string, - }[matrix_mautrix_telegram_database_engine] -}}" +matrix_mautrix_telegram_appservice_database_uri: "{{ { + 'sqlite': matrix_mautrix_telegram_sqlite_database_path_in_container, + 'postgres': matrix_mautrix_telegram_database_connection_string, +}[matrix_mautrix_telegram_database_engine] }}" matrix_mautrix_telegram_double_puppet_secrets: "{{ matrix_mautrix_telegram_double_puppet_secrets_auto | combine(matrix_mautrix_telegram_double_puppet_secrets_custom) }}" matrix_mautrix_telegram_double_puppet_secrets_auto: {} diff --git a/roles/custom/matrix-bridge-mautrix-twitter/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-twitter/defaults/main.yml index 94107d29f..b1c02d536 100644 --- a/roles/custom/matrix-bridge-mautrix-twitter/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-twitter/defaults/main.yml @@ -130,11 +130,9 @@ matrix_mautrix_twitter_database_sslmode: disable matrix_mautrix_twitter_database_connection_string: 'postgres://{{ matrix_mautrix_twitter_database_username }}:{{ matrix_mautrix_twitter_database_password }}@{{ matrix_mautrix_twitter_database_hostname }}:{{ matrix_mautrix_twitter_database_port }}/{{ matrix_mautrix_twitter_database_name }}?sslmode={{ matrix_mautrix_twitter_database_sslmode }}' -matrix_mautrix_twitter_database_uri: "{{ - { - 'postgres': matrix_mautrix_twitter_database_connection_string, - }[matrix_mautrix_twitter_database_engine] -}}" +matrix_mautrix_twitter_database_uri: "{{ { + 'postgres': matrix_mautrix_twitter_database_connection_string, +}[matrix_mautrix_twitter_database_engine] }}" matrix_mautrix_twitter_double_puppet_secrets: "{{ matrix_mautrix_twitter_double_puppet_secrets_auto | combine(matrix_mautrix_twitter_double_puppet_secrets_custom) }}" matrix_mautrix_twitter_double_puppet_secrets_auto: {} diff --git a/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml index dbd46e1a7..7dd8ba779 100644 --- a/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml @@ -147,19 +147,15 @@ matrix_mautrix_whatsapp_database_sslmode: disable 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 }}?sslmode={{ matrix_mautrix_whatsapp_database_sslmode }}' -matrix_mautrix_whatsapp_appservice_database_type: "{{ - { - 'sqlite': 'sqlite3-fk-wal', - 'postgres':'postgres', - }[matrix_mautrix_whatsapp_database_engine] -}}" +matrix_mautrix_whatsapp_appservice_database_type: "{{ { + 'sqlite': 'sqlite3-fk-wal', + 'postgres': 'postgres', +}[matrix_mautrix_whatsapp_database_engine] }}" -matrix_mautrix_whatsapp_appservice_database_uri: "{{ - { - 'sqlite': matrix_mautrix_whatsapp_sqlite_database_path_in_container, - 'postgres': matrix_mautrix_whatsapp_database_connection_string, - }[matrix_mautrix_whatsapp_database_engine] -}}" +matrix_mautrix_whatsapp_appservice_database_uri: "{{ { + 'sqlite': matrix_mautrix_whatsapp_sqlite_database_path_in_container, + 'postgres': matrix_mautrix_whatsapp_database_connection_string, +}[matrix_mautrix_whatsapp_database_engine] }}" matrix_mautrix_whatsapp_double_puppet_secrets: "{{ matrix_mautrix_whatsapp_double_puppet_secrets_auto | combine(matrix_mautrix_whatsapp_double_puppet_secrets_custom) }}" matrix_mautrix_whatsapp_double_puppet_secrets_auto: {} diff --git a/roles/custom/matrix-bridge-postmoogle/defaults/main.yml b/roles/custom/matrix-bridge-postmoogle/defaults/main.yml index b0fec65e6..e5a19a704 100644 --- a/roles/custom/matrix-bridge-postmoogle/defaults/main.yml +++ b/roles/custom/matrix-bridge-postmoogle/defaults/main.yml @@ -68,19 +68,15 @@ matrix_postmoogle_database_sslmode: disable matrix_postmoogle_database_connection_string: 'postgres://{{ matrix_postmoogle_database_username }}:{{ matrix_postmoogle_database_password }}@{{ matrix_postmoogle_database_hostname }}:{{ matrix_postmoogle_database_port }}/{{ matrix_postmoogle_database_name }}?sslmode={{ matrix_postmoogle_database_sslmode }}' -matrix_postmoogle_storage_database: "{{ - { - 'sqlite': matrix_postmoogle_sqlite_database_path_in_container, - 'postgres': matrix_postmoogle_database_connection_string, - }[matrix_postmoogle_database_engine] -}}" +matrix_postmoogle_storage_database: "{{ { + 'sqlite': matrix_postmoogle_sqlite_database_path_in_container, + 'postgres': matrix_postmoogle_database_connection_string, +}[matrix_postmoogle_database_engine] }}" -matrix_postmoogle_database_dialect: "{{ - { +matrix_postmoogle_database_dialect: "{{ { 'sqlite': 'sqlite3', 'postgres': 'postgres', - }[matrix_postmoogle_database_engine] -}}" +}[matrix_postmoogle_database_engine] }}" # The bot's username. This user needs to be created manually beforehand. diff --git a/roles/custom/matrix-bridge-steam/defaults/main.yml b/roles/custom/matrix-bridge-steam/defaults/main.yml index b4c96b9fe..966416515 100644 --- a/roles/custom/matrix-bridge-steam/defaults/main.yml +++ b/roles/custom/matrix-bridge-steam/defaults/main.yml @@ -164,11 +164,9 @@ matrix_steam_bridge_database_sslmode: disable matrix_steam_bridge_database_connection_string: 'postgres://{{ matrix_steam_bridge_database_username }}:{{ matrix_steam_bridge_database_password }}@{{ matrix_steam_bridge_database_hostname }}:{{ matrix_steam_bridge_database_port }}/{{ matrix_steam_bridge_database_name }}?sslmode={{ matrix_steam_bridge_database_sslmode }}' -matrix_steam_bridge_database_uri: "{{ - { - 'postgres': matrix_steam_bridge_database_connection_string, - }[matrix_steam_bridge_database_engine] -}}" +matrix_steam_bridge_database_uri: "{{ { + 'postgres': matrix_steam_bridge_database_connection_string, +}[matrix_steam_bridge_database_engine] }}" matrix_steam_bridge_double_puppet_secrets: "{{ matrix_steam_bridge_double_puppet_secrets_auto | combine(matrix_steam_bridge_double_puppet_secrets_custom) }}" matrix_steam_bridge_double_puppet_secrets_auto: {} diff --git a/roles/custom/matrix-registration/defaults/main.yml b/roles/custom/matrix-registration/defaults/main.yml index 22a7ccff5..bc2d997cf 100644 --- a/roles/custom/matrix-registration/defaults/main.yml +++ b/roles/custom/matrix-registration/defaults/main.yml @@ -112,12 +112,10 @@ matrix_registration_database_connection_string: 'postgresql://{{ matrix_registra # For some reason, matrix-registraiton expects the `db` field to be like this: `sqlite:////data/db.sqlite3`. # (seems like one too many slashes, but..) -matrix_registration_db: "{{ - { - 'sqlite': ('sqlite:///' + matrix_registration_sqlite_database_path_in_container), - 'postgres': matrix_registration_database_connection_string, - }[matrix_registration_database_engine] -}}" +matrix_registration_db: "{{ { + 'sqlite': ('sqlite:///' + matrix_registration_sqlite_database_path_in_container), + 'postgres': matrix_registration_database_connection_string, +}[matrix_registration_database_engine] }}" matrix_registration_base_url: "{{ matrix_registration_path_prefix }}" diff --git a/roles/custom/matrix-static-files/defaults/main.yml b/roles/custom/matrix-static-files/defaults/main.yml index ee8ef8eb7..abc3e33dd 100644 --- a/roles/custom/matrix-static-files/defaults/main.yml +++ b/roles/custom/matrix-static-files/defaults/main.yml @@ -208,7 +208,7 @@ matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_enab # Controls the org.matrix.msc4143.rtc_foci property in the /.well-known/matrix/client file. # See `matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_enabled` -matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci: "{{ matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_auto+ matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_custom }}" +matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci: "{{ matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_auto + matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_custom }}" matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_auto: [] matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_custom: []