Просмотр исходного кода

fix: rename `matrix_authentication_service_config_account_registration_token_required` setting to `matrix_authentication_service_config_account_password_registration_token_required`

This change was made in order to use the MAS `account.password_registration_token_required` setting instead of the deprecated `account.registration_token_required` setting
master
Jean-Benoît Grimaldi 2 дней назад
committed by Slavi Pantaleev
Родитель
Сommit
f1c1d42214
3 измененных файлов: 9 добавлений и 8 удалений
  1. +7
    -7
      roles/custom/matrix-authentication-service/defaults/main.yml
  2. +1
    -0
      roles/custom/matrix-authentication-service/tasks/validate_config.yml
  3. +1
    -1
      roles/custom/matrix-authentication-service/templates/config.yaml.j2

+ 7
- 7
roles/custom/matrix-authentication-service/defaults/main.yml Просмотреть файл

@@ -223,6 +223,13 @@ matrix_authentication_service_config_account_password_registration_enabled: fals
# Whether self-service password registrations require a valid email. # Whether self-service password registrations require a valid email.
matrix_authentication_service_config_account_password_registration_email_required: true matrix_authentication_service_config_account_password_registration_email_required: true


# Controls the `account.password_registration_token_required` configuration setting.
#
# Whether registration tokens are required for password registrations.
# When enabled, users must provide a valid registration token during password
# registration. This has no effect if password registration is disabled.
matrix_authentication_service_config_account_password_registration_token_required: false

# Controls the `account.password_change_allowed` configuration setting. # Controls the `account.password_change_allowed` configuration setting.
# #
# Whether users are allowed to change their passwords. # Whether users are allowed to change their passwords.
@@ -246,13 +253,6 @@ matrix_authentication_service_config_account_account_deactivation_allowed: true
# This has no effect if password login is disabled. # This has no effect if password login is disabled.
matrix_authentication_service_config_account_login_with_email_allowed: false matrix_authentication_service_config_account_login_with_email_allowed: false


# Controls the `account.registration_token_required` configuration setting.
#
# Whether registration tokens are required for password registrations.
# When enabled, users must provide a valid registration token during password
# registration. This has no effect if password registration is disabled.
matrix_authentication_service_config_account_registration_token_required: false

######################################################################################## ########################################################################################
# # # #
# /Account configuration # # /Account configuration #


+ 1
- 0
roles/custom/matrix-authentication-service/tasks/validate_config.yml Просмотреть файл

@@ -61,3 +61,4 @@
- {'old': 'matrix_authentication_service_syn2mas_process_extra_arguments', 'new': 'matrix_authentication_service_syn2mas_command_extra_options or matrix_authentication_service_syn2mas_subcommand_extra_options'} - {'old': 'matrix_authentication_service_syn2mas_process_extra_arguments', 'new': 'matrix_authentication_service_syn2mas_command_extra_options or matrix_authentication_service_syn2mas_subcommand_extra_options'}
- {'old': 'matrix_authentication_service_syn2mas_dry_run', 'new': 'matrix_authentication_service_syn2mas_migrate_dry_run'} - {'old': 'matrix_authentication_service_syn2mas_dry_run', 'new': 'matrix_authentication_service_syn2mas_migrate_dry_run'}
- {'old': 'matrix_authentication_service_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'} - {'old': 'matrix_authentication_service_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
- {'old': 'matrix_authentication_service_config_account_registration_token_required', 'new': 'matrix_authentication_service_config_account_password_registration_token_required'}

+ 1
- 1
roles/custom/matrix-authentication-service/templates/config.yaml.j2 Просмотреть файл

@@ -66,11 +66,11 @@ account:
displayname_change_allowed: {{ matrix_authentication_service_config_account_displayname_change_allowed | to_json }} displayname_change_allowed: {{ matrix_authentication_service_config_account_displayname_change_allowed | to_json }}
password_registration_enabled: {{ matrix_authentication_service_config_account_password_registration_enabled | to_json }} password_registration_enabled: {{ matrix_authentication_service_config_account_password_registration_enabled | to_json }}
password_registration_email_required: {{ matrix_authentication_service_config_account_password_registration_email_required | to_json }} password_registration_email_required: {{ matrix_authentication_service_config_account_password_registration_email_required | to_json }}
password_registration_token_required: {{ matrix_authentication_service_config_account_password_registration_token_required | to_json }}
password_change_allowed: {{ matrix_authentication_service_config_account_password_change_allowed | to_json }} password_change_allowed: {{ matrix_authentication_service_config_account_password_change_allowed | to_json }}
password_recovery_enabled: {{ matrix_authentication_service_config_account_password_recovery_enabled | to_json }} password_recovery_enabled: {{ matrix_authentication_service_config_account_password_recovery_enabled | to_json }}
account_deactivation_allowed: {{ matrix_authentication_service_config_account_account_deactivation_allowed | to_json }} account_deactivation_allowed: {{ matrix_authentication_service_config_account_account_deactivation_allowed | to_json }}
login_with_email_allowed: {{ matrix_authentication_service_config_account_login_with_email_allowed | to_json }} login_with_email_allowed: {{ matrix_authentication_service_config_account_login_with_email_allowed | to_json }}
registration_token_required: {{ matrix_authentication_service_config_account_registration_token_required | to_json }}


{% if matrix_authentication_service_config_captcha_service %} {% if matrix_authentication_service_config_captcha_service %}
captcha: captcha:


Загрузка…
Отмена
Сохранить