From f8682668c210fe0a5585620adf0ad498f7370bec Mon Sep 17 00:00:00 2001 From: Quentin Date: Fri, 18 Sep 2020 19:55:48 +0200 Subject: [PATCH] Upgrade Element Web to new config.json - Display deuxfleurs.fr and not im.deuxfleurs.fr on login screen - Remove broken welcome page on login - Set our jitsi instance - Add more servers in the room discovery page --- app/build/docker-compose.yml | 4 +-- app/build/riotweb/config.json | 24 ------------- .../configuration/chat/riot_web/config.json | 34 ++++++++++++++++--- app/deployment/im.hcl | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 app/build/riotweb/config.json diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml index b10445a..d96833c 100644 --- a/app/build/docker-compose.yml +++ b/app/build/docker-compose.yml @@ -7,8 +7,8 @@ services: context: ./riotweb args: # https://github.com/vector-im/riot-web/releases - VERSION: 1.7.5 - image: superboum/amd64_riotweb:v15 + VERSION: 1.7.7 + image: superboum/amd64_riotweb:v16 synapse: build: diff --git a/app/build/riotweb/config.json b/app/build/riotweb/config.json deleted file mode 100644 index 8ce8e4c..0000000 --- a/app/build/riotweb/config.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "default_hs_url": "https://im.deuxfleurs.fr", - "default_is_url": "https://vector.im", - "disable_custom_urls": false, - "disable_guests": false, - "disable_login_language_selector": false, - "disable_3pid_login": false, - "brand": "Deuxfleurs", - "integrations_ui_url": "https://scalar.vector.im/", - "integrations_rest_url": "https://scalar.vector.im/api", - "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html", - "bug_report_endpoint_url": "https://riot.im/bugreports/submit", - "features": { - "feature_groups": "labs", - "feature_pinning": "labs" - }, - "default_federate": true, - "welcomePageUrl": "home.html", - "default_theme": "light", - "roomDirectory": { - "servers": [ "im.deuxfleurs.fr", "matrix.org" ] - } -} - diff --git a/app/config/configuration/chat/riot_web/config.json b/app/config/configuration/chat/riot_web/config.json index 5844afc..9c898f0 100644 --- a/app/config/configuration/chat/riot_web/config.json +++ b/app/config/configuration/chat/riot_web/config.json @@ -1,6 +1,13 @@ { - "default_hs_url": "https://im.deuxfleurs.fr", - "default_is_url": "https://vector.im", + "default_server_config": { + "m.homeserver": { + "base_url": "https://im.deuxfleurs.fr", + "server_name": "deuxfleurs.fr" + }, + "m.identity_server": { + "base_url": "https://vector.im" + } + }, "disable_custom_urls": false, "disable_guests": false, "disable_login_language_selector": false, @@ -8,16 +15,33 @@ "brand": "Deuxfleurs", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", - "bug_report_endpoint_url": "https://riot.im/bugreports/submit", + "integrations_widgets_urls": [ + "https://scalar.vector.im/_matrix/integrations/v1", + "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", + "https://scalar-staging.vector.im/api", + "https://scalar-staging.riot.im/scalar/api" + ], + "bug_report_endpoint_url": "https://element.io/bugreports/submit", + "defaultCountryCode": "FR", + "showLabsSettings": true, "features": { + "feature_new_spinner": true, "feature_groups": "labs", "feature_pinning": "labs" }, "default_federate": true, - "welcomePageUrl": "home.html", "default_theme": "light", "roomDirectory": { - "servers": [ "im.deuxfleurs.fr", "matrix.org" ] + "servers": [ + "deuxfleurs.fr", + "matrix.org", + "tedomum.net", + "zinz.dev" + ] + }, + "settingDefaults": { + "breadcrumbs": true }, "jitsi": { "preferredDomain": "jitsi.deuxfleurs.fr" diff --git a/app/deployment/im.hcl b/app/deployment/im.hcl index b758011..c7528d1 100644 --- a/app/deployment/im.hcl +++ b/app/deployment/im.hcl @@ -239,7 +239,7 @@ job "im" { task "server" { driver = "docker" config { - image = "superboum/amd64_riotweb:v15" + image = "superboum/amd64_riotweb:v16" port_map { web_port = 8043 }