From d2c564704e93b88dd254cc57079eed502cf1f5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Fri, 17 Apr 2026 03:15:52 +0200 Subject: [PATCH] Make ansible-lint at least a bit more happy --- .../caddy2-in-container/docker-compose.yaml | 2 +- jitsi_jvb.yml | 12 ++-- .../matrix-bot-buscarron/defaults/main.yml | 18 +++--- .../matrix-bot-go-neb/defaults/main.yml | 8 +-- .../matrix-bot-honoroit/defaults/main.yml | 18 +++--- .../defaults/main.yml | 10 ++- .../matrix-bot-maubot/defaults/main.yml | 10 ++- .../defaults/main.yml | 10 ++- .../defaults/main.yml | 18 +++--- .../defaults/main.yml | 8 +-- .../defaults/main.yml | 22 +++---- .../defaults/main.yml | 22 +++---- .../defaults/main.yml | 10 ++- .../defaults/main.yml | 22 +++---- .../defaults/main.yml | 22 +++---- .../defaults/main.yml | 10 ++- .../defaults/main.yml | 8 +-- .../defaults/main.yml | 22 +++---- .../defaults/main.yml | 18 +++--- .../matrix-bridge-steam/defaults/main.yml | 8 +-- .../matrix-registration/defaults/main.yml | 10 ++- .../matrix-static-files/defaults/main.yml | 2 +- setup.yml | 62 +++++++++---------- 23 files changed, 148 insertions(+), 204 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/jitsi_jvb.yml b/jitsi_jvb.yml index d57c15a97..49d0245e9 100644 --- a/jitsi_jvb.yml +++ b/jitsi_jvb.yml @@ -11,11 +11,11 @@ become: true roles: - - role: galaxy/com.devture.ansible.role.playbook_help - - role: galaxy/com.devture.ansible.role.systemd_docker_base + - role: playbook_help + - role: systemd_docker_base - when: matrix_playbook_docker_installation_enabled | bool - role: galaxy/geerlingguy.docker + role: docker vars: docker_install_compose: false tags: @@ -26,7 +26,7 @@ - install-all - when: devture_docker_sdk_for_python_installation_enabled | bool - role: galaxy/com.devture.ansible.role.docker_sdk_for_python + role: docker_sdk_for_python tags: - setup-docker - setup-all @@ -35,8 +35,8 @@ - install-all - custom/matrix-base - - galaxy/jitsi + - jitsi - custom/matrix-common-after - when: devture_systemd_service_manager_enabled | bool - role: galaxy/com.devture.ansible.role.systemd_service_manager + role: systemd_service_manager 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_database_dialect: "{{ - { +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: "{{ { '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_database_dialect: "{{ - { +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: "{{ { '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_uri: "{{ - { - 'postgres': matrix_beeper_linkedin_database_connection_string, - }[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_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_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_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_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_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_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_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_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_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_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_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_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_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 007d0a936..2fdbc0038 100644 --- a/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml @@ -193,12 +193,10 @@ matrix_mautrix_telegram_database_name: 'matrix_mautrix_telegram' matrix_mautrix_telegram_database_connection_string: 'postgres://{{ 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: "{{ - { - 'sqlite': ('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: "{{ { + 'sqlite': ('sqlite:///' + matrix_mautrix_telegram_sqlite_database_path_in_container), + 'postgres': matrix_mautrix_telegram_database_connection_string, +}[matrix_mautrix_telegram_database_engine] }}" matrix_mautrix_telegram_bridge_login_shared_secret_map: "{{ matrix_mautrix_telegram_bridge_login_shared_secret_map_auto | combine(matrix_mautrix_telegram_bridge_login_shared_secret_map_custom) }}" matrix_mautrix_telegram_bridge_login_shared_secret_map_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_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_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_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_database_dialect: "{{ - { +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: "{{ { '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: [] diff --git a/setup.yml b/setup.yml index b319b087e..d5512d3fb 100644 --- a/setup.yml +++ b/setup.yml @@ -5,17 +5,17 @@ roles: # Most of the roles below are not distributed with the playbook, but downloaded separately using `ansible-galaxy` via the `just roles` command (see `justfile`). - - role: galaxy/playbook_help + - role: playbook_help tags: - setup-all - install-all - - role: galaxy/systemd_docker_base + - role: systemd_docker_base - role: custom/matrix_playbook_migration - when: matrix_playbook_docker_installation_enabled | bool - role: galaxy/docker + role: docker vars: docker_install_compose: false docker_install_compose_plugin: false @@ -26,7 +26,7 @@ - install-all - when: devture_docker_sdk_for_python_installation_enabled | bool - role: galaxy/docker_sdk_for_python + role: docker_sdk_for_python tags: - setup-docker - setup-all @@ -34,7 +34,7 @@ - install-all - when: devture_timesync_installation_enabled | bool - role: galaxy/timesync + role: timesync tags: - setup-timesync - setup-all @@ -42,12 +42,12 @@ - install-all - custom/matrix-base - - galaxy/ddclient - - galaxy/exim_relay + - ddclient + - exim_relay - - role: galaxy/postgres + - role: postgres - - galaxy/valkey + - valkey - role: custom/matrix-authentication-service - custom/matrix-corporal @@ -98,60 +98,60 @@ - custom/matrix-continuwuity - custom/matrix-ketesa - custom/matrix-synapse-usage-exporter - - galaxy/prometheus_nginxlog_exporter - - galaxy/prometheus_node_exporter - - galaxy/prometheus_postgres_exporter - - galaxy/prometheus - - galaxy/grafana + - prometheus_nginxlog_exporter + - prometheus_node_exporter + - prometheus_postgres_exporter + - prometheus + - grafana - custom/matrix-prometheus-services-connect - custom/matrix-registration - custom/matrix-client-element - custom/matrix-client-commet - - galaxy/hydrogen - - galaxy/cinny - - galaxy/sable + - hydrogen + - cinny + - sable - custom/matrix-client-schildichat - custom/matrix-client-fluffychat - - galaxy/jitsi + - jitsi - custom/matrix-user-verification-service - custom/matrix-ldap-registration-proxy - - galaxy/etherpad + - etherpad - custom/matrix-sygnal - - galaxy/ntfy + - ntfy - custom/matrix-static-files - - galaxy/coturn + - coturn - custom/matrix-media-repo - custom/matrix-pantalaimon - custom/matrix-element-admin - custom/matrix-element-call - - galaxy/livekit_server + - livekit_server - custom/matrix-livekit-jwt-service - - role: galaxy/postgres_backup + - role: postgres_backup - - role: galaxy/backup_borg + - role: backup_borg - custom/matrix-user-creator - custom/matrix-common-after - - role: galaxy/container_socket_proxy + - role: container_socket_proxy - - role: galaxy/traefik + - role: traefik - - role: galaxy/traefik_certs_dumper + - role: traefik_certs_dumper - - role: galaxy/auxiliary + - role: auxiliary - when: devture_systemd_service_manager_enabled | bool - role: galaxy/systemd_service_manager + role: systemd_service_manager # This is pretty much last, because we want it to better serve as a "last known good configuration". # See: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2217#issuecomment-1301487601 - when: devture_playbook_state_preserver_enabled | bool - role: galaxy/playbook_state_preserver + role: playbook_state_preserver tags: - setup-all - install-all - - role: galaxy/playbook_runtime_messages + - role: playbook_runtime_messages