Ver a proveniência
Replace `synapse_admin_contact` with `matrix_synapse_adminContact`
`synapse_admin_` is reserved for Synapse Admin
Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
pull/4932/head
Suguru Hirahara
há 3 meses
ascendente
cometimento
72d9dce6bf
Não foi encontrada uma chave conhecida para esta assinatura, na base de dados
ID da chave GPG: E4F9743DAB4B7B75
3 ficheiros alterados com
3 adições e
2 eliminações
-
roles/custom/matrix-synapse/defaults/main.yml
-
roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
-
roles/custom/matrix_playbook_migration/tasks/validate_config.yml
|
|
|
@@ -425,7 +425,7 @@ matrix_synapse_form_secret: "{{ matrix_synapse_macaroon_secret_key }}" |
|
|
|
|
|
|
|
|
|
|
|
# Controls how to reach server admin, used in ResouceLimitError |
|
|
|
synapse_admin_contact: ~ |
|
|
|
matrix_synapse_adminContact: ~ # noqa var-naming |
|
|
|
|
|
|
|
matrix_synapse_max_upload_size_mb: 50 |
|
|
|
|
|
|
|
|
|
|
|
@@ -391,7 +391,7 @@ manhole_settings: |
|
|
|
|
|
|
|
# How to reach the server admin, used in ResourceLimitError |
|
|
|
# |
|
|
|
admin_contact: {{ synapse_admin_contact | to_json }} |
|
|
|
admin_contact: {{ matrix_synapse_adminContact | to_json }} |
|
|
|
|
|
|
|
# Global blocking |
|
|
|
# |
|
|
|
|
|
|
|
@@ -107,6 +107,7 @@ |
|
|
|
- {'old': 'synapse_admin_public_endpoint', 'new': 'synapse_admin_path_prefix'} |
|
|
|
- {'old': 'synapse_admin_nginx_proxy_integration_enabled', 'new': '<removed>'} |
|
|
|
- {'old': 'synapse_admin_docker_image_name_prefix', 'new': 'synapse_admin_container_image_registry_prefix'} |
|
|
|
- {'old': 'matrix_synapse_admin_contact', 'new': 'matrix_synapse_adminContact'} |
|
|
|
|
|
|
|
- name: (Deprecation) Catch and report matrix_postgres variables |
|
|
|
ansible.builtin.fail: |
|
|
|
|