Преглед на файлове

change variable for enable user registration

pull/1620/head
Andrea Giovine преди 4 години
родител
ревизия
6bc2391fb2
променени са 11 файла, в които са добавени 15 реда и са изтрити 15 реда
  1. +1
    -1
      CHANGELOG.md
  2. +1
    -1
      docs/configuring-captcha.md
  3. +2
    -2
      docs/configuring-playbook-ma1sd.md
  4. +1
    -1
      docs/registering-users.md
  5. +1
    -1
      group_vars/matrix_servers
  6. +2
    -2
      roles/matrix-awx/surveys/configure_synapse.json.j2
  7. +1
    -1
      roles/matrix-awx/tasks/set_variables_synapse.yml
  8. +1
    -1
      roles/matrix-dendrite/defaults/main.yml
  9. +1
    -1
      roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2
  10. +2
    -2
      roles/matrix-synapse/defaults/main.yml
  11. +2
    -2
      roles/matrix-synapse/templates/synapse/homeserver.yaml.j2

+ 1
- 1
CHANGELOG.md Целия файл

@@ -1644,7 +1644,7 @@ Additional details are available in [Setting up the LDAP authentication password

## Support for controlling public registration and room auto-join

The playbook now lets you enable public registration for users (controlled via `matrix_synapse_enable_registration`).
The playbook now lets you enable public registration for users (controlled via `matrix_homeserver_enable_registration`).
By default, public registration is forbidden.

You can also make people automatically get auto-joined to rooms (controlled via `matrix_synapse_auto_join_rooms`).


+ 1
- 1
docs/configuring-captcha.md Целия файл

@@ -17,7 +17,7 @@ Must be a reCAPTCHA **v2** key using the "I'm not a robot" Checkbox option
Once registered as above, set the following values:

```yaml
matrix_synapse_enable_registration_captcha: true
matrix_homeserver_enable_registration_captcha: true
matrix_synapse_recaptcha_public_key: 'YOUR_SITE_KEY'
matrix_synapse_recaptcha_private_key: 'YOUR_SECRET_KEY'
```

+ 2
- 2
docs/configuring-playbook-ma1sd.md Целия файл

@@ -42,9 +42,9 @@ If you'd like to change the default email templates used by ma1sd, take a look a

To use the [Registration](https://github.com/ma1uta/ma1sd/blob/master/docs/features/registration.md) feature of ma1sd, you can make use of the following variables:

- `matrix_synapse_enable_registration` - to enable user-initiated registration in Synapse
- `matrix_homeserver_enable_registration` - to enable user-initiated registration in Synapse

- `matrix_synapse_enable_registration_captcha` - to validate registering users using reCAPTCHA, as described in the [enabling reCAPTCHA](configuring_captcha.md) documentation.
- `matrix_homeserver_enable_registration_captcha` - to validate registering users using reCAPTCHA, as described in the [enabling reCAPTCHA](configuring_captcha.md) documentation.

- `matrix_synapse_registrations_require_3pid` - to control the types of 3pid (`'email'`, `'msisdn'`) required by the Synapse server for registering



+ 1
- 1
docs/registering-users.md Целия файл

@@ -50,7 +50,7 @@ If you'd rather **keep your server private** (public registration closed, as is
To **open up user registration publicly** (usually **not recommended**), consider using the following configuration:

```yaml
matrix_synapse_enable_registration: true
matrix_homeserver_enable_registration: true
```

and running the [installation](installing.md) procedure once again.


+ 1
- 1
group_vars/matrix_servers Целия файл

@@ -1866,7 +1866,7 @@ matrix_client_element_integrations_jitsi_widget_url: "{{ matrix_dimension_integr

matrix_client_element_self_check_validate_certificates: "{{ false if matrix_ssl_retrieval_method == 'self-signed' else true }}"

matrix_client_element_registration_enabled: "{{ matrix_synapse_enable_registration }}"
matrix_client_element_registration_enabled: "{{ matrix_homeserver_enable_registration }}"

matrix_client_element_enable_presence_by_hs_url: |
{{


+ 2
- 2
roles/matrix-awx/surveys/configure_synapse.json.j2 Целия файл

@@ -8,10 +8,10 @@
"required": false,
"min": null,
"max": null,
"default": "{{ matrix_synapse_enable_registration | string | lower }}",
"default": "{{ matrix_homeserver_enable_registration | string | lower }}",
"choices": "true\nfalse",
"new_question": true,
"variable": "matrix_synapse_enable_registration",
"variable": "matrix_homeserver_enable_registration",
"type": "multiplechoice"
},
{


+ 1
- 1
roles/matrix-awx/tasks/set_variables_synapse.yml Целия файл

@@ -19,7 +19,7 @@
insertafter: '# Synapse Settings Start'
with_dict:
'matrix_synapse_allow_public_rooms_over_federation': '{{ matrix_synapse_allow_public_rooms_over_federation }}'
'matrix_synapse_enable_registration': '{{ matrix_synapse_enable_registration }}'
'matrix_homeserver_enable_registration': '{{ matrix_homeserver_enable_registration }}'
'matrix_synapse_federation_enabled': '{{ matrix_synapse_federation_enabled }}'
'matrix_synapse_enable_group_creation': '{{ matrix_synapse_enable_group_creation }}'
'matrix_synapse_presence_enabled': '{{ matrix_synapse_presence_enabled }}'


+ 1
- 1
roles/matrix-dendrite/defaults/main.yml Целия файл

@@ -82,7 +82,7 @@ matrix_dendrite_rate_limiting_threshold: 5
matrix_dendrite_rate_limiting_cooloff_ms: 500

# Controls whether people with access to the homeserver can register by themselves.
matrix_dendrite_registration_disabled: false
matrix_homeserver_enable_registration: false

# reCAPTCHA API for validating registration attempts
matrix_dendrite_enable_registration_captcha: false


+ 1
- 1
roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2 Целия файл

@@ -144,7 +144,7 @@ client_api:

# Prevents new users from being able to register on this homeserver, except when
# using the registration shared secret below.
registration_disabled: {{ matrix_dendrite_registration_disabled|to_json }}
registration_disabled: {{ matrix_homeserver_enable_registration|to_json }}

# If set, allows registration by anyone who knows the shared secret, regardless of
# whether registration is otherwise disabled.


+ 2
- 2
roles/matrix-synapse/defaults/main.yml Целия файл

@@ -201,10 +201,10 @@ matrix_synapse_limit_profile_requests_to_users_who_share_rooms: false
matrix_synapse_include_profile_data_on_invite: true

# Controls whether people with access to the homeserver can register by themselves.
matrix_synapse_enable_registration: false
matrix_homeserver_enable_registration: false

# reCAPTCHA API for validating registration attempts
matrix_synapse_enable_registration_captcha: false
matrix_homeserver_enable_registration_captcha: false
matrix_synapse_recaptcha_public_key: ''
matrix_synapse_recaptcha_private_key: ''



+ 2
- 2
roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 Целия файл

@@ -1176,7 +1176,7 @@ recaptcha_private_key: {{ matrix_synapse_recaptcha_private_key|to_json }}
# unless a captcha is answered. Requires a valid ReCaptcha
# public/private key. Defaults to 'false'.
#
enable_registration_captcha: {{ matrix_synapse_enable_registration_captcha|to_json }}
enable_registration_captcha: {{ matrix_homeserver_enable_registration_captcha|to_json }}

# The API endpoint to use for verifying m.login.recaptcha responses.
# Defaults to "https://www.recaptcha.net/recaptcha/api/siteverify".
@@ -1220,7 +1220,7 @@ turn_allow_guests: {{ matrix_synapse_turn_allow_guests|to_json }}

# Enable registration for new users.
#
enable_registration: {{ matrix_synapse_enable_registration|to_json }}
enable_registration: {{ matrix_homeserver_enable_registration|to_json }}

# Time that a user's session remains valid for, after they log in.
#


Зареждане…
Отказ
Запис