From c78d679d2e2eedf2a92be776a7a987367c522597 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 14 Jan 2022 10:49:58 +0100
Subject: [PATCH 1/3] Update config file to upstream

---
 conf/config.json | 45 ++++++++++++++++++++++++++++++++++++++++++---
 manifest.json    |  2 +-
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/conf/config.json b/conf/config.json
index fb0a558..291dd13 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -1,13 +1,52 @@
 {
-    "default_hs_url": "https://__DEFAULT_HOME_SERVER__",
-    "default_is_url": "https://vector.im",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://__DEFAULT_HOME_SERVER__",
+            "server_name": "matrix.org"
+        },
+        "m.identity_server": {
+            "base_url": "https://vector.im"
+        }
+    },
+    "disable_custom_urls": false,
+    "disable_guests": false,
+    "disable_login_language_selector": false,
+    "disable_3pid_login": false,
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
-    "enableLabs": true,
+    "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": "GB",
+    "showLabsSettings": false,
+    "features": { },
+    "default_federate": true,
+    "default_theme": "light",
     "roomDirectory": {
         "servers": [
             "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,
+        "https://matrix-client.matrix.org": false
+    },
+    "settingDefaults": {
+        "breadcrumbs": true
+    },
+    "jitsi": {
+        "preferredDomain": "meet.element.io"
     }
 }
diff --git a/manifest.json b/manifest.json
index e489a92..7c871e4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -47,7 +47,7 @@
 					"fr": "Choisissez un serveur par défault"
 				},
 				"example": "my-own-homeserver.tld",
-				"default": "matrix.org"
+				"default": "matrix-client.matrix.org"
 			},
 			{
 				"name": "is_public",

From 467ed3767eaea061f92661ee0a5d34a9ae6a1aba Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 14 Jan 2022 10:52:09 +0100
Subject: [PATCH 2/3] Update check_process

---
 check_process | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_process b/check_process
index a01e917..40fe437 100644
--- a/check_process
+++ b/check_process
@@ -2,7 +2,7 @@
     ; Manifest
         domain="domain.tld"
         path="/path"
-        default_home_server="matrix.org"
+        default_home_server="matrix-client.matrix.org"
         is_public=1
     ; Checks
         pkg_linter=1

From e79e8ece27b8544966c685d56023535f8c53bb18 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 14 Jan 2022 10:53:12 +0100
Subject: [PATCH 3/3] Update check_process

---
 check_process | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/check_process b/check_process
index 40fe437..fd611b1 100644
--- a/check_process
+++ b/check_process
@@ -15,7 +15,6 @@
         upgrade=1   from_commit=34d457d13e526997fddb8348650674a7db2247be
         backup_restore=1
         multi_instance=1
-        port_already_use=0
         change_url=1
 ;;; Upgrade options
 ;;; Upgrade options
@@ -23,4 +22,4 @@
         name=34d457d13e526997fddb8348650674a7db2247be
         manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
 
-        
\ No newline at end of file
+    
\ No newline at end of file