mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-04-25 09:57:35 +00:00
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>` role references to just
`<role>` 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 <slavi@devture.com>
This commit is contained in:
committed by
Slavi Pantaleev
parent
5b7a1c2a6c
commit
e0bc2be687
@@ -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: {}
|
||||
|
||||
Reference in New Issue
Block a user