From f713bbe0f81d283f84bfeb24e7de52d76b5ecc21 Mon Sep 17 00:00:00 2001 From: Oleg Fiksel Date: Thu, 8 Aug 2019 11:53:07 +0200 Subject: [PATCH 1/2] Added possibility to enable guest access on synapse --- roles/matrix-synapse/defaults/main.yml | 2 ++ roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml index ac3026e8..3bdfca11 100644 --- a/roles/matrix-synapse/defaults/main.yml +++ b/roles/matrix-synapse/defaults/main.yml @@ -61,6 +61,7 @@ matrix_synapse_template_synapse_log: "{{ role_path }}/templates/synapse/synapse. matrix_synapse_macaroon_secret_key: "" matrix_synapse_registration_shared_secret: "{{ matrix_synapse_macaroon_secret_key }}" +matrix_synapse_allow_guest_access: false matrix_synapse_form_secret: "{{ matrix_synapse_macaroon_secret_key }}" # The list of identity servers to use for Synapse. @@ -223,6 +224,7 @@ matrix_synapse_database_database: "" matrix_synapse_turn_uris: [] matrix_synapse_turn_shared_secret: "" +matrix_synapse_turn_allow_guests: False matrix_synapse_email_enabled: false matrix_synapse_email_smtp_host: "" diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 index 124825ad..9f8dffaf 100644 --- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 +++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 @@ -749,7 +749,7 @@ turn_shared_secret: {{ matrix_synapse_turn_shared_secret|string|to_json }} # connect to arbitrary endpoints without having first signed up for a # valid account (e.g. by passing a CAPTCHA). # -turn_allow_guests: False +turn_allow_guests: {{ matrix_synapse_turn_allow_guests }} ## Registration ## @@ -854,7 +854,7 @@ registration_shared_secret: {{ matrix_synapse_registration_shared_secret|string| # participate in rooms hosted on this server which have been made # accessible to anonymous users. # -#allow_guest_access: false +allow_guest_access: {{ matrix_synapse_allow_guest_access }} # The identity server which we suggest that clients should use when users log # in on this server. From 43628ddad6b8fcb1b7397fb9005bb7335d2c3d91 Mon Sep 17 00:00:00 2001 From: Oleg Fiksel Date: Thu, 8 Aug 2019 12:11:14 +0200 Subject: [PATCH 2/2] Added "|to_json" to ensure we really pass a boolean --- roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 index 9f8dffaf..5eddfb6e 100644 --- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 +++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 @@ -749,7 +749,7 @@ turn_shared_secret: {{ matrix_synapse_turn_shared_secret|string|to_json }} # connect to arbitrary endpoints without having first signed up for a # valid account (e.g. by passing a CAPTCHA). # -turn_allow_guests: {{ matrix_synapse_turn_allow_guests }} +turn_allow_guests: {{ matrix_synapse_turn_allow_guests|to_json }} ## Registration ## @@ -854,7 +854,7 @@ registration_shared_secret: {{ matrix_synapse_registration_shared_secret|string| # participate in rooms hosted on this server which have been made # accessible to anonymous users. # -allow_guest_access: {{ matrix_synapse_allow_guest_access }} +allow_guest_access: {{ matrix_synapse_allow_guest_access|to_json }} # The identity server which we suggest that clients should use when users log # in on this server.