From 450afde85ee69b6c7d3c18a42b0ec95798cd8ea8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 6 Mar 2020 16:37:17 +0000
Subject: [PATCH 1/2] Add config for Riot Nightly

And also 1) revert an accidental commit to the main config file, and
2) port over some forgotten things to the main config file
---
 riot.im.nightly/config.json | 55 +++++++++++++++++++++++++++++++++++++
 riot.im/config.json         | 16 +++++++++--
 2 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 riot.im.nightly/config.json

diff --git a/riot.im.nightly/config.json b/riot.im.nightly/config.json
new file mode 100644
index 0000000..323e004
--- /dev/null
+++ b/riot.im.nightly/config.json
@@ -0,0 +1,55 @@
+{
+    "update_base_url": "https://packages.riot.im/nightly/update/",
+    "default_server_name": "matrix.org",
+    "brand": "Riot",
+    "integrations_ui_url": "https://scalar-staging.vector.im/",
+    "integrations_rest_url": "https://scalar-staging.vector.im/api",
+    "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"
+    ],
+    "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
+    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+    "features": {
+        "feature_pinning": "labs",
+        "feature_custom_status": "labs",
+        "feature_custom_tags": "labs",
+        "feature_state_counters": "labs",
+        "feature_many_integration_managers": "labs",
+        "feature_mjolnir": "labs",
+        "feature_dm_verification": "labs",
+        "feature_cross_signing": "enable",
+        "feature_invite_only_padlocks": "enable",
+        "feature_event_indexing": "disable",
+        "feature_bridge_state": "labs",
+        "feature_presence_in_room_list": "labs"
+    },
+    "welcomeUserId": "@riot-bot:matrix.org",
+    "piwik": {
+        "url": "https://piwik.riot.im/",
+        "siteId": 1,
+        "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
+    },
+    "roomDirectory": {
+        "servers": [
+            "matrix.org"
+        ]
+    },
+    "enable_presence_by_hs_url": {
+        "https://matrix.org": false,
+        "https://matrix-client.matrix.org": false
+    },
+    "terms_and_conditions_links": [
+        {
+            "url": "https://riot.im/privacy",
+            "text": "Privacy Policy"
+        },
+        {
+            "url": "https://matrix.org/legal/riot-im-cookie-policy",
+            "text": "Cookie Policy"
+        }
+    ]
+}
diff --git a/riot.im/config.json b/riot.im/config.json
index 3aeb363..9189784 100644
--- a/riot.im/config.json
+++ b/riot.im/config.json
@@ -1,4 +1,5 @@
 {
+    "update_base_url": "https://packages.riot.im/desktop/update/",
     "default_server_name": "matrix.org",
     "brand": "Riot",
     "integrations_ui_url": "https://scalar.vector.im/",
@@ -30,11 +31,20 @@
         }
     },
     "features": {
-        "feature_lazyloading": "enable",
-        "feature_event_indexing": "labs"
+        "feature_lazyloading": "enable"
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
-    }
+    },
+    "terms_and_conditions_links": [
+        {
+            "url": "https://riot.im/privacy",
+            "text": "Privacy Policy"
+        },
+        {
+            "url": "https://matrix.org/legal/riot-im-cookie-policy",
+            "text": "Cookie Policy"
+        }
+    ]
 }

From e34736954c5fc76fe33a11adbf35be92893a1c3b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 6 Mar 2020 17:20:48 +0000
Subject: [PATCH 2/2] More sensible dir tree

---
 {riot.im.nightly => riot.im/nightly}/config.json | 0
 riot.im/{ => release}/conf_distributions         | 0
 riot.im/{ => release}/config.json                | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {riot.im.nightly => riot.im/nightly}/config.json (100%)
 rename riot.im/{ => release}/conf_distributions (100%)
 rename riot.im/{ => release}/config.json (100%)

diff --git a/riot.im.nightly/config.json b/riot.im/nightly/config.json
similarity index 100%
rename from riot.im.nightly/config.json
rename to riot.im/nightly/config.json
diff --git a/riot.im/conf_distributions b/riot.im/release/conf_distributions
similarity index 100%
rename from riot.im/conf_distributions
rename to riot.im/release/conf_distributions
diff --git a/riot.im/config.json b/riot.im/release/config.json
similarity index 100%
rename from riot.im/config.json
rename to riot.im/release/config.json