Przeglądaj źródła

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 3 tygodni temu
rodzic
commit
72d9dce6bf
Nie znaleziono w bazie danych klucza dla tego podpisu ID klucza GPG: E4F9743DAB4B7B75
3 zmienionych plików z 3 dodań i 2 usunięć
  1. +1
    -1
      roles/custom/matrix-synapse/defaults/main.yml
  2. +1
    -1
      roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
  3. +1
    -0
      roles/custom/matrix_playbook_migration/tasks/validate_config.yml

+ 1
- 1
roles/custom/matrix-synapse/defaults/main.yml Wyświetl plik

@@ -425,7 +425,7 @@ matrix_synapse_form_secret: "{{ matrix_synapse_macaroon_secret_key }}"




# Controls how to reach server admin, used in ResouceLimitError # 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 matrix_synapse_max_upload_size_mb: 50




+ 1
- 1
roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 Wyświetl plik

@@ -391,7 +391,7 @@ manhole_settings:


# How to reach the server admin, used in ResourceLimitError # 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 # Global blocking
# #


+ 1
- 0
roles/custom/matrix_playbook_migration/tasks/validate_config.yml Wyświetl plik

@@ -107,6 +107,7 @@
- {'old': 'synapse_admin_public_endpoint', 'new': 'synapse_admin_path_prefix'} - {'old': 'synapse_admin_public_endpoint', 'new': 'synapse_admin_path_prefix'}
- {'old': 'synapse_admin_nginx_proxy_integration_enabled', 'new': '<removed>'} - {'old': 'synapse_admin_nginx_proxy_integration_enabled', 'new': '<removed>'}
- {'old': 'synapse_admin_docker_image_name_prefix', 'new': 'synapse_admin_container_image_registry_prefix'} - {'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 - name: (Deprecation) Catch and report matrix_postgres variables
ansible.builtin.fail: ansible.builtin.fail:


Ładowanie…
Anuluj
Zapisz