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

Merge pull request #30 from aaronraimist/riot-web-config-json

Browse Source 
Allow a few parts of Riot config.json to be configured (#24)
This commit is contained in:
Slavi Pantaleev 2018-11-03 12:01:03 +02:00 committed by GitHub
commit 6e6ed3f9f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CHANGELOG.md
View File

@ -1,5 +1,27 @@
# 2018-11-03 # 2018-11-03
## Customize parts of Riot's config
You can now customize some parts of Riot's `config.json`. These playbook variables, with these default values, have been added:
```
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_jitsi_widget_url: "https://scalar.vector.im/api/widgets/jitsi.html"
```
This now allows you use a custom integrations manager like [Dimesion](https://dimension.t2bot.io). For example, if you wish to use the Dimension instance hosted at dimension.t2bot.io, you can set the following in your vars.yml file:
```
matrix_riot_web_integrations_ui_url: "https://dimension.t2bot.io/riot"
matrix_riot_web_integrations_rest_url: "https://dimension.t2bot.io/api/v1/scalar"
matrix_riot_web_integrations_widgets_urls: "https://dimension.t2bot.io/widgets"
matrix_riot_web_integrations_jitsi_widget_url: "https://dimension.t2bot.io/widgets/jitsi"
```
## SSL protocols used to serve Riot and Synapse ## SSL protocols used to serve Riot and Synapse
There's now a new `matrix_nginx_proxy_ssl_protocols` playbook variable, which controls the SSL protocols used to serve Riot and Synapse. Its default value is `TLSv1.1 TLSv1.2`. This playbook previously used `TLSv1 TLSv1.1 TLSv1.2` to serve Riot and Synapse. There's now a new `matrix_nginx_proxy_ssl_protocols` playbook variable, which controls the SSL protocols used to serve Riot and Synapse. Its default value is `TLSv1.1 TLSv1.2`. This playbook previously used `TLSv1 TLSv1.1 TLSv1.2` to serve Riot and Synapse.

8
roles/matrix-server/defaults/main.yml
View File

@ -247,6 +247,14 @@ matrix_riot_web_docker_image: "avhost/docker-matrix-riot:v0.17.3"
matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web" matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"
# Riot config.json customizations
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_jitsi_widget_url: "https://scalar.vector.im/api/widgets/jitsi.html"
# Matrix mautrix is a Matrix <-> Telegram bridge # Matrix mautrix is a Matrix <-> Telegram bridge

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

@ -1,11 +1,13 @@
{ {
"default_hs_url": "{{ matrix_homeserver_url }}", "default_hs_url": "{{ matrix_homeserver_url }}",
"default_is_url": "{{ matrix_identity_server_url }}", "default_is_url": "{{ matrix_identity_server_url }}",
"disable_custom_urls": true, "disable_custom_urls": {{ matrix_riot_web_disable_custom_urls|lower }},
"disable_guests": true, "disable_guests": {{ matrix_riot_web_disable_guests|lower }},
"brand": "Riot", "brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/", "integrations_ui_url": "{{ matrix_riot_web_integrations_ui_url }}",
"integrations_rest_url": "https://scalar.vector.im/api", "integrations_rest_url": "{{ matrix_riot_web_integrations_rest_url }}",
"integrations_widgets_urls": "{{ matrix_riot_web_integrations_widgets_urls }}",
"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,
"roomDirectory": { "roomDirectory": {
@ -14,4 +16,4 @@
] ]
}, },
"welcomeUserId": "@riot-bot:matrix.org" "welcomeUserId": "@riot-bot:matrix.org"
} }