From 2706ca95865427ea9bac19957658fff738c1b9ba Mon Sep 17 00:00:00 2001 From: Stefan Warnat Date: Wed, 17 Jul 2019 15:56:15 +0200 Subject: [PATCH 1/2] add configuration to change Riot.im branding --- roles/matrix-riot-web/defaults/main.yml | 3 +++ roles/matrix-riot-web/templates/config.json.j2 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml index d5648044d..9950d3028 100644 --- a/roles/matrix-riot-web/defaults/main.yml +++ b/roles/matrix-riot-web/defaults/main.yml @@ -21,6 +21,7 @@ matrix_riot_web_default_hs_url: "" matrix_riot_web_default_is_url: ~ 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"] @@ -28,6 +29,8 @@ matrix_riot_web_integrations_jitsi_widget_url: "https://scalar.vector.im/api/wid # Riot public room directory server(s) matrix_riot_web_roomdir_servers: ['matrix.org'] matrix_riot_web_welcome_user_id: "@riot-bot:matrix.org" +# Branding of riot web +matrix_riot_web_brand: "Riot" # By default, there's no Riot homepage (when logged in). If you wish to have one, # point this to a `home.html` template file on your local filesystem. diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2 index e8c183b4a..c5e5cad07 100644 --- a/roles/matrix-riot-web/templates/config.json.j2 +++ b/roles/matrix-riot-web/templates/config.json.j2 @@ -4,7 +4,7 @@ "default_is_url": {{ matrix_riot_web_default_is_url|string|to_json }}, "disable_custom_urls": {{ matrix_riot_web_disable_custom_urls|to_json }}, "disable_guests": {{ matrix_riot_web_disable_guests|to_json }}, - "brand": "Riot", + "brand": {{ matrix_riot_web_brand|to_json }}, "integrations_ui_url": {{ matrix_riot_web_integrations_ui_url|string|to_json }}, "integrations_rest_url": {{ matrix_riot_web_integrations_rest_url|string|to_json }}, "integrations_widgets_urls": {{ matrix_riot_web_integrations_widgets_urls|to_json }}, From 2d24779583edfeac388c1203eae2cb9eb67b3f59 Mon Sep 17 00:00:00 2001 From: Stefan Warnat Date: Wed, 17 Jul 2019 15:57:22 +0200 Subject: [PATCH 2/2] remove newline --- roles/matrix-riot-web/defaults/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml index 9950d3028..bc8002bca 100644 --- a/roles/matrix-riot-web/defaults/main.yml +++ b/roles/matrix-riot-web/defaults/main.yml @@ -21,7 +21,6 @@ matrix_riot_web_default_hs_url: "" matrix_riot_web_default_is_url: ~ 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"]