finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix scalar widgets

Browse Source 
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
This commit is contained in:
Sylvia van Os 2019-01-16 14:03:39 +01:00
parent 906942f304
commit cec2aa61c1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/matrix-riot-web/defaults/main.yml
View File

@ -12,7 +12,7 @@ matrix_riot_web_disable_custom_urls: true
matrix_riot_web_disable_guests: true matrix_riot_web_disable_guests: true
matrix_riot_web_integrations_ui_url: "https://scalar.vector.im/" 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_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" matrix_riot_web_integrations_jitsi_widget_url: "https://scalar.vector.im/api/widgets/jitsi.html"
# Riot public room directory server(s) # Riot public room directory server(s)
matrix_riot_web_roomdir_servers: ['matrix.org'] matrix_riot_web_roomdir_servers: ['matrix.org']
@ -29,4 +29,4 @@ matrix_riot_web_homepage_template_technical: true
# Show building services on Matrix row # Show building services on Matrix row
matrix_riot_web_homepage_template_building: true matrix_riot_web_homepage_template_building: true
# Show contributing code to Matrix and Riot row # Show contributing code to Matrix and Riot row
matrix_riot_web_homepage_template_contributing: true matrix_riot_web_homepage_template_contributing: true

2
roles/matrix-riot-web/templates/config.json.j2
View File

@ -6,7 +6,7 @@
"brand": "Riot", "brand": "Riot",
"integrations_ui_url": "{{ matrix_riot_web_integrations_ui_url }}", "integrations_ui_url": "{{ matrix_riot_web_integrations_ui_url }}",
"integrations_rest_url": "{{ matrix_riot_web_integrations_rest_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 }}", "integrations_jitsi_widget_url": "{{ matrix_riot_web_integrations_jitsi_widget_url }}",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit", "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"enableLabs": true, "enableLabs": true,