9d6ea68523
22523c0e42 added role variables that wrap certain mxisd configuration
keys. This has the obvious drawback that not all keys are accessible but
only the wrapped.
This change replaces the previously added wrapper role variables by a
single dictionary variable `matrix_mxisd_extra_config` in which arbirary
mxisd configuration keys can be added.
There's still the same default mxisd configuration. Keys of that default
are overwritten individually when added to `matrix_mxisd_extra_config`.
22 lines
1018 B
Django/Jinja
22 lines
1018 B
Django/Jinja
{% set matrix_mxisd_default_config = {
|
|
"matrix.domain": hostname_identity,
|
|
"server.name": hostname_matrix,
|
|
"key.path": "/var/mxisd/sign.key",
|
|
"storage.provider.sqlite.database": "/var/mxisd/mxisd.db",
|
|
"threepid.medium.email.identity.from": matrix_mailer_sender_address,
|
|
"threepid.medium.email.connectors.smtp.host": "matrix-mailer",
|
|
"threepid.medium.email.connectors.smtp.port": 587,
|
|
"threepid.medium.email.connectors.smtp.tls": 0,
|
|
"synapseSql.enabled": true,
|
|
"synapseSql.type": "postgresql",
|
|
"synapseSql.connection": "//" + matrix_postgres_connection_hostname + "/" + matrix_postgres_db_name + "?user=" + matrix_postgres_connection_username + "&password=" + matrix_postgres_connection_password
|
|
} %}
|
|
|
|
{% if matrix_mxisd_matrixorg_forwarding_enabled %}
|
|
{% set matrix_mxisd_default_config = matrix_mxisd_default_config | combine(
|
|
{ "forward.servers": [ "matrix-org" ] }
|
|
) %}
|
|
{% endif %}
|
|
|
|
{{ matrix_mxisd_default_config | combine(matrix_mxisd_extra_config, recursive=true) | to_nice_yaml }}
|