From cec2aa61c1b5542d058db7c85ff1f9a4476f966f Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Wed, 16 Jan 2019 14:03:39 +0100 Subject: [PATCH] Fix scalar widgets Riot-web parses integrations_widgets_urls as a list, thus causing it to incorrectly think Scalar widgets are non-Scalar and not passing the scalar token --- roles/matrix-riot-web/defaults/main.yml | 4 ++-- roles/matrix-riot-web/templates/config.json.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml index bd2b42d2..ea5b8095 100644 --- a/roles/matrix-riot-web/defaults/main.yml +++ b/roles/matrix-riot-web/defaults/main.yml @@ -12,7 +12,7 @@ matrix_riot_web_disable_custom_urls: true matrix_riot_web_disable_guests: true matrix_riot_web_integrations_ui_url: "https://scalar.vector.im/" matrix_riot_web_integrations_rest_url: "https://scalar.vector.im/api" -matrix_riot_web_integrations_widgets_urls: "https://scalar.vector.im/api" +matrix_riot_web_integrations_widgets_urls: ["https://scalar.vector.im/api"] matrix_riot_web_integrations_jitsi_widget_url: "https://scalar.vector.im/api/widgets/jitsi.html" # Riot public room directory server(s) matrix_riot_web_roomdir_servers: ['matrix.org'] @@ -29,4 +29,4 @@ matrix_riot_web_homepage_template_technical: true # Show building services on Matrix row matrix_riot_web_homepage_template_building: true # Show contributing code to Matrix and Riot row -matrix_riot_web_homepage_template_contributing: true \ No newline at end of file +matrix_riot_web_homepage_template_contributing: true diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2 index 6a979912..6add6512 100644 --- a/roles/matrix-riot-web/templates/config.json.j2 +++ b/roles/matrix-riot-web/templates/config.json.j2 @@ -6,7 +6,7 @@ "brand": "Riot", "integrations_ui_url": "{{ matrix_riot_web_integrations_ui_url }}", "integrations_rest_url": "{{ matrix_riot_web_integrations_rest_url }}", - "integrations_widgets_urls": "{{ matrix_riot_web_integrations_widgets_urls }}", + "integrations_widgets_urls": {{ matrix_riot_web_integrations_widgets_urls|to_json }}, "integrations_jitsi_widget_url": "{{ matrix_riot_web_integrations_jitsi_widget_url }}", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "enableLabs": true,