From 0579ef2b2ffa1bdb04594078802819a432fc4238 Mon Sep 17 00:00:00 2001 From: Tee Mak Date: Fri, 22 Mar 2019 15:41:27 -0400 Subject: [PATCH 1/2] Updated to show more features. Shows more features that can be enabled for config.json. --- config.sample.json | 58 +++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/config.sample.json b/config.sample.json index 4208438d530..623ad1a1ede 100644 --- a/config.sample.json +++ b/config.sample.json @@ -1,34 +1,54 @@ { "default_hs_url": "https://matrix.org", "default_is_url": "https://vector.im", - "disable_custom_urls": false, - "disable_guests": false, - "disable_login_language_selector": false, - "disable_3pid_login": false, "brand": "Riot", - "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", + "integrations_ui_url": "https://scalar-staging.riot.im/scalar-web/", + "integrations_rest_url": "https://scalar-staging.riot.im/scalar/api", + "integrations_widgets_urls": [ + "https://scalar-staging.riot.im/scalar/api", + "https://scalar.vector.im/api" + ], + "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "features": { - "feature_groups": "labs", - "feature_pinning": "labs" + "feature_rich_quoting": "labs", + "feature_pinning": "labs", + "feature_presence_management": "labs", + "feature_sticker_messages": "labs", + "feature_jitsi": "labs", + "feature_tag_panel": "enable", + "feature_keybackup": "labs", + "feature_custom_status": "labs", + "feature_custom_tags": "labs", + "feature_lazyloading": "enable", + "feature_tabbed_settings": "labs", + "feature_sas": "labs", + "feature_room_breadcrumbs": "labs", + "feature_state_counters": "labs" + }, + "enableLabs": true, + "welcomeUserId": "@riot-bot:matrix.org", + "piwik": { + "url": "https://piwik.riot.im/", + "siteId": 1, + "policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy" }, - "default_federate": true, - "default_theme": "light", "roomDirectory": { "servers": [ "matrix.org" ] }, - "welcomeUserId": "@riot-bot:matrix.org", - "piwik": { - "url": "https://piwik.riot.im/", - "whitelistedHSUrls": ["https://matrix.org"], - "whitelistedISUrls": ["https://vector.im", "https://matrix.org"], - "siteId": 1 - }, "enable_presence_by_hs_url": { "https://matrix.org": false - } + }, + "terms_and_conditions_links": [ + { + "url": "https://riot.im/privacy", + "text": "Privacy Policy" + }, + { + "url": "https://matrix.org/docs/guides/riot_im_cookie_policy", + "text": "Cookie Policy" + } + ] } From 0edc52e363e1b78387607846934a0de72b44ffe4 Mon Sep 17 00:00:00 2001 From: TeeMak Date: Fri, 22 Mar 2019 16:35:29 -0400 Subject: [PATCH 2/2] Added script to generate config.sample.json with all configurable options --- config.sample.json | 105 +++++++++++++++--------------- scripts/gen-config-sample-json-sh | 59 +++++++++++++++++ 2 files changed, 111 insertions(+), 53 deletions(-) create mode 100755 scripts/gen-config-sample-json-sh diff --git a/config.sample.json b/config.sample.json index 623ad1a1ede..78fc30e6095 100644 --- a/config.sample.json +++ b/config.sample.json @@ -1,54 +1,53 @@ { - "default_hs_url": "https://matrix.org", - "default_is_url": "https://vector.im", - "brand": "Riot", - "integrations_ui_url": "https://scalar-staging.riot.im/scalar-web/", - "integrations_rest_url": "https://scalar-staging.riot.im/scalar/api", - "integrations_widgets_urls": [ - "https://scalar-staging.riot.im/scalar/api", - "https://scalar.vector.im/api" - ], - "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", - "bug_report_endpoint_url": "https://riot.im/bugreports/submit", - "features": { - "feature_rich_quoting": "labs", - "feature_pinning": "labs", - "feature_presence_management": "labs", - "feature_sticker_messages": "labs", - "feature_jitsi": "labs", - "feature_tag_panel": "enable", - "feature_keybackup": "labs", - "feature_custom_status": "labs", - "feature_custom_tags": "labs", - "feature_lazyloading": "enable", - "feature_tabbed_settings": "labs", - "feature_sas": "labs", - "feature_room_breadcrumbs": "labs", - "feature_state_counters": "labs" - }, - "enableLabs": true, - "welcomeUserId": "@riot-bot:matrix.org", - "piwik": { - "url": "https://piwik.riot.im/", - "siteId": 1, - "policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy" - }, - "roomDirectory": { - "servers": [ - "matrix.org" - ] - }, - "enable_presence_by_hs_url": { - "https://matrix.org": false - }, - "terms_and_conditions_links": [ - { - "url": "https://riot.im/privacy", - "text": "Privacy Policy" - }, - { - "url": "https://matrix.org/docs/guides/riot_im_cookie_policy", - "text": "Cookie Policy" - } - ] -} + "default_hs_url": "https://matrix.org", + "default_is_url": "https://vector.im", + "brand": "Riot", + "integrations_ui_url": "https://scalar-staging.riot.im/scalar-web/", + "integrations_rest_url": "https://scalar-staging.riot.im/scalar/api", + "integrations_widgets_urls": [ + "https://scalar-staging.riot.im/scalar/api", + "https://scalar.vector.im/api" + ], + "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", + "bug_report_endpoint_url": "https://riot.im/bugreports/submit", + "features": { + "feature_rich_quoting": "labs", + "feature_pinning": "labs", + "feature_presence_management": "labs", + "feature_sticker_messages": "labs", + "feature_jitsi": "labs", + "feature_tag_panel": "enable", + "feature_keybackup": "labs", + "feature_custom_status": "labs", + "feature_custom_tags": "labs", + "feature_lazyloading": "enable", + "feature_tabbed_settings": "labs", + "feature_sas": "labs", + "feature_room_breadcrumbs": "labs", + "feature_state_counters": "labs" + }, + "welcomeUserId": "@riot-bot:matrix.org", + "piwik": { + "url": "https://piwik.riot.im/", + "siteId": 1, + "policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy" + }, + "roomDirectory": { + "servers": [ + "matrix.org" + ] + }, + "enable_presence_by_hs_url": { + "https://matrix.org": false + }, + "terms_and_conditions_links": [ + { + "url": "https://riot.im/privacy", + "text": "Privacy Policy" + }, + { + "url": "https://matrix.org/docs/guides/riot_im_cookie_policy", + "text": "Cookie Policy" + } + ] + } diff --git a/scripts/gen-config-sample-json-sh b/scripts/gen-config-sample-json-sh new file mode 100755 index 00000000000..ef06fc6c491 --- /dev/null +++ b/scripts/gen-config-sample-json-sh @@ -0,0 +1,59 @@ +#!/bin/sh +# +# script to generate config.sample.json + +config="{\n + \t\"default_hs_url\": \"https://matrix.org\",\n + \t\"default_is_url\": \"https://vector.im\",\n + \t\"brand\": \"Riot\",\n + \t\"integrations_ui_url\": \"https://scalar-staging.riot.im/scalar-web/\",\n + \t\"integrations_rest_url\": \"https://scalar-staging.riot.im/scalar/api\",\n + \t\"integrations_widgets_urls\": [\n + \t\t\"https://scalar-staging.riot.im/scalar/api\",\n + \t\t\"https://scalar.vector.im/api\"\n + \t],\n + \t\"hosting_signup_link\": \"https://modular.im/?utm_source=riot-web&utm_medium=web\",\n + \t\"bug_report_endpoint_url\": \"https://riot.im/bugreports/submit\",\n + \t\"features\": {\n + \t\t\"feature_rich_quoting\": \"labs\",\n + \t\t\"feature_pinning\": \"labs\",\n + \t\t\"feature_presence_management\": \"labs\",\n + \t\t\"feature_sticker_messages\": \"labs\",\n + \t\t\"feature_jitsi\": \"labs\",\n + \t\t\"feature_tag_panel\": \"enable\",\n + \t\t\"feature_keybackup\": \"labs\",\n + \t\t\"feature_custom_status\": \"labs\",\n + \t\t\"feature_custom_tags\": \"labs\",\n + \t\t\"feature_lazyloading\": \"enable\",\n + \t\t\"feature_tabbed_settings\": \"labs\",\n + \t\t\"feature_sas\": \"labs\",\n + \t\t\"feature_room_breadcrumbs\": \"labs\",\n + \t\t\"feature_state_counters\": \"labs\"\n + \t},\n + \t\"welcomeUserId\": \"@riot-bot:matrix.org\",\n + \t\"piwik\": {\n + \t\t\"url\": \"https://piwik.riot.im/\",\n + \t\t\"siteId\": 1,\n + \t\t\"policyUrl\": \"https://matrix.org/docs/guides/riot_im_cookie_policy\"\n + \t},\n + \t\"roomDirectory\": {\n + \t\t\"servers\": [\n + \t\t\t\"matrix.org\"\n + \t\t]\n + \t},\n + \t\"enable_presence_by_hs_url\": {\n + \t\t\"https://matrix.org\": false\n + \t},\n + \t\"terms_and_conditions_links\": [\n + \t\t{\n + \t\t\t\"url\": \"https://riot.im/privacy\",\n + \t\t\t\"text\": \"Privacy Policy\"\n + \t\t},\n + \t\t{\n + \t\t\t\"url\": \"https://matrix.org/docs/guides/riot_im_cookie_policy\",\n + \t\t\t\"text\": \"Cookie Policy\"\n + \t\t}\n + \t]\n +}" + +echo $config > ../config.sample.json