Просмотр исходного кода

Allow a few parts of Riot config.json to be configured (#24)

pull/30/head
Aaron Raimist 7 лет назад
Родитель
Сommit
ef2e330d22
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 37419210002890EF
3 измененных файлов: 40 добавлений и 5 удалений
  1. +25
    -0
      CHANGELOG.md
  2. +8
    -0
      roles/matrix-server/defaults/main.yml
  3. +7
    -5
      roles/matrix-server/templates/riot-web/config.json.j2

+ 25
- 0
CHANGELOG.md Просмотреть файл

@@ -1,3 +1,28 @@
# 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"
```


# 2018-11-01

## Postgres 11 support


+ 8
- 0
roles/matrix-server/defaults/main.yml Просмотреть файл

@@ -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"

# 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


+ 7
- 5
roles/matrix-server/templates/riot-web/config.json.j2 Просмотреть файл

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

Загрузка…
Отмена
Сохранить