From c198a74a34e7307426b80e91186d4668d8da7d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Wed, 12 Jan 2022 16:22:21 +0100 Subject: [PATCH] __matrix_element: add --identity_server_url flag --- type/__matrix_element/files/config.json.sh | 2 +- type/__matrix_element/man.rst | 6 ++++++ type/__matrix_element/manifest | 1 + type/__matrix_element/parameter/optional | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/type/__matrix_element/files/config.json.sh b/type/__matrix_element/files/config.json.sh index 9791f38..30ba9e7 100755 --- a/type/__matrix_element/files/config.json.sh +++ b/type/__matrix_element/files/config.json.sh @@ -52,7 +52,7 @@ cat << EOF "server_name": "$DEFAULT_SERVER_NAME" }, "m.identity_server": { - "base_url": "https://vector.im" + "base_url": "$IDENTITY_SERVER_URL" } }, "brand": "$BRAND", diff --git a/type/__matrix_element/man.rst b/type/__matrix_element/man.rst index 05f0685..c91379f 100644 --- a/type/__matrix_element/man.rst +++ b/type/__matrix_element/man.rst @@ -27,6 +27,12 @@ default_server_name default_server_url URL of matrix homeserver to connect to, defaults to 'https://matrix-client.matrix.org'. +identity_server_url + URL of matrix identity server to connect to, defaults to 'https://vector.im'. + See element documentation + `_` + for details. + owner Owner of the deployed files, passed to `chown`. Defaults to 'root'. diff --git a/type/__matrix_element/manifest b/type/__matrix_element/manifest index 544bd96..292cefd 100755 --- a/type/__matrix_element/manifest +++ b/type/__matrix_element/manifest @@ -25,6 +25,7 @@ INSTALL_DIR=$(cat "$__object/parameter/install_dir") export DEFAULT_SERVER_NAME=$(cat "$__object/parameter/default_server_name") export DEFAULT_SERVER_URL=$(cat "$__object/parameter/default_server_url") +export IDENTITY_SERVER_URL=$(cat "$__object/parameter/identity_server_url") export BRAND=$(cat "$__object/parameter/brand") export DEFAULT_COUNTRY_CODE=$(cat "$__object/parameter/default_country_code") export ROOM_DIRECTORY_SERVERS=$(cat "$__object/parameter/room_directory_servers") diff --git a/type/__matrix_element/parameter/optional b/type/__matrix_element/parameter/optional index 21a2faf..65a142b 100644 --- a/type/__matrix_element/parameter/optional +++ b/type/__matrix_element/parameter/optional @@ -1,5 +1,6 @@ default_server_url default_server_name +identity_server_url brand default_country_code privacy_policy_url