From 8edabcada7b12fabc1cedf7de9fe5ffdff91cc74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 4 Nov 2022 21:14:56 +0100
Subject: [PATCH 01/28] v2

---
 conf/nginx.conf |  2 +-
 manifest.toml   | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
 scripts/backup  | 12 +++++-----
 scripts/install | 46 ++++++++++++++++++-------------------
 scripts/remove  | 16 ++++++-------
 scripts/restore | 26 ++++++++++-----------
 scripts/upgrade | 40 ++++++++++++++++-----------------
 7 files changed, 131 insertions(+), 71 deletions(-)
 create mode 100644 manifest.toml

diff --git a/conf/nginx.conf b/conf/nginx.conf
index b5f38e3..58bbde2 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,7 +1,7 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-    alias __FINALPATH__/;
+    alias __INSTALL_DIR__/;
     
     index index.html;
     
diff --git a/manifest.toml b/manifest.toml
new file mode 100644
index 0000000..6d2ebe2
--- /dev/null
+++ b/manifest.toml
@@ -0,0 +1,60 @@
+packaging_format = 2
+
+id = "element"
+name = "Element"
+description.en = "Web client for Matrix"
+description.fr = "Client web pour Matrix"
+
+version = "1.11.13~ynh1"
+
+maintainers = ["Josué Tille"]
+
+[upstream]
+license = "Apache-2.0"
+website = "https://element.io"
+demo = "https://app.element.io/"
+admindoc = "https://element.io/help"
+code = "https://github.com/vector-im/element-web/"
+cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number)
+fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin.
+
+[integration]
+yunohost = ">= 4.3.0"
+architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64/armel), for example: ["amd64", "i386"]
+multi_instance = true
+ldap = "?" # FIXME: replace with true, false, or "not_relevant"
+sso = "?" # FIXME: replace with true, false, or "not_relevant"
+disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ...
+ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
+ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
+
+[install]
+    [install.domain]
+    # this is a generic question - ask strings are automatically handled by Yunohost's core
+    type = "domain"
+
+    [install.path]
+    # this is a generic question - ask strings are automatically handled by Yunohost's core
+    type = "path"
+    default = "/element"
+
+    [install.default_home_server]
+    ask.en = "Choose a default home server"
+    ask.fr = "Choisissez un serveur par défault"
+    type = "string"
+    example = "my-own-homeserver.tld"
+    default = "matrix.org"
+
+    [install.init_main_permission]
+    help.en = "A public application means that anyone can access it. Note that this application provides just files (html, javascript, images, etc.)"
+    help.fr = "Une application publique signifie que n'importe qui peut y accéder. Notez que cette application ne fournit que des fichiers (html, javascript, images, etc.)"
+    type = "group"
+    default = false
+
+[resources]
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.permissions]
+    main.url = "/"
diff --git a/scripts/backup b/scripts/backup
index 6201eec..0355f43 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -15,17 +15,17 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 # Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
+#REMOVEME? ynh_abort_if_errors
 
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_print_info --message="Loading installation settings..."
+#REMOVEME? ynh_print_info --message="Loading installation settings..."
 
-app=$YNH_APP_INSTANCE_NAME
+#REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-domain=$(ynh_app_setting_get --app=$app --key=domain)
+#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
+#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -36,7 +36,7 @@ ynh_print_info --message="Declaring files to be backed up..."
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$install_dir"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
diff --git a/scripts/install b/scripts/install
index f0f8dc9..0db8d96 100644
--- a/scripts/install
+++ b/scripts/install
@@ -14,59 +14,59 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 # Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
+#REMOVEME? ynh_abort_if_errors
 
 #=================================================
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
 # Retrieve arguments
-domain=$YNH_APP_ARG_DOMAIN
-path_url=$YNH_APP_ARG_PATH
-is_public=$YNH_APP_ARG_IS_PUBLIC
-default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER
+#REMOVEME? domain=$YNH_APP_ARG_DOMAIN
+#REMOVEME? path=$YNH_APP_ARG_PATH
+#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC
+#REMOVEME? default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER
 
-app=$YNH_APP_INSTANCE_NAME
+#REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
 login_for_welcome=true
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-ynh_script_progression --message="Validating installation parameters..." --weight=1
+#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1
 
-final_path=/var/www/$app
-test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
+#REMOVEME? install_dir=/var/www/$app
+#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder"
 
 # Register (book) web path
-ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
+#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..." --weight=1
+#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1
 
-ynh_app_setting_set --app=$app --key=domain --value=$domain
-ynh_app_setting_set --app=$app --key=path --value=$path_url
+#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain
+#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path
 ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
 ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome
 
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Configuring system user..." --weight=1
+#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=1
 
 # Create a system user
-ynh_system_user_create --username=$app --home_dir="$final_path"
+#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=4
 
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path"
+ynh_setup_source --dest_dir="$install_dir"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -81,20 +81,20 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/config.json" --destination="$final_path/config.json"
+ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
 
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=1
+#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=1
 
 # Make app public if necessary
-if [ $is_public -eq 1 ]
+#REMOVEME? if [ $is_public -eq 1 ]
 then
-	ynh_permission_update --permission="main" --add="visitors"
+#REMOVEME? 	ynh_permission_update --permission="main" --add="visitors"
 fi
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index e2bc3c1..c2a44db 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -12,20 +12,20 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
+#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1
 
-app=$YNH_APP_INSTANCE_NAME
+#REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
+#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
 
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Removing app main directory..." --weight=1
+#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=1
 
 # Remove the app directory securely
-ynh_secure_remove --file="$final_path"
+#REMOVEME? ynh_secure_remove --file="$install_dir"
 
 #=================================================
 # REMOVE NGINX CONFIGURATION
@@ -40,10 +40,10 @@ ynh_remove_nginx_config
 #=================================================
 # REMOVE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --weight=1
+#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=1
 
 # Delete a system user
-ynh_system_user_delete --username=$app
+#REMOVEME? ynh_system_user_delete --username=$app
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/restore b/scripts/restore
index 0958a88..f1d1d13 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -15,25 +15,25 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 # Stop script if errors
-ynh_abort_if_errors
+#REMOVEME? ynh_abort_if_errors
 
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
+#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1
 
-app=$YNH_APP_INSTANCE_NAME
+#REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
+#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path)
+#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
-ynh_script_progression --message="Validating restoration parameters..." --weight=1
+#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1
 
-test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
+#REMOVEME? test ! -d $install_dir || ynh_die --message="There is already a directory: $install_dir "
 
 #=================================================
 # STANDARD RESTORATION STEPS
@@ -47,20 +47,20 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
+#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
 
 # Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
+#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir"
 
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
 ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
-ynh_restore_file --origin_path="$final_path"
+ynh_restore_file --origin_path="$install_dir"
 
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index c259066..e1c0c8f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,16 +12,16 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
+#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1
 
-app=$YNH_APP_INSTANCE_NAME
+#REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-default_home_server=$(ynh_app_setting_get --app=$app --key=default_home_server)
+#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
+#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path)
+#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
+#REMOVEME? default_home_server=$(ynh_app_setting_get --app=$app --key=default_home_server)
 
-login_for_welcome=$(ynh_app_setting_get --app=$app --key=login_for_welcome)
+#REMOVEME? login_for_welcome=$(ynh_app_setting_get --app=$app --key=login_for_welcome)
 
 #=================================================
 # CHECK VERSION
@@ -32,16 +32,16 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
+#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
 
 # Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
+#REMOVEME? ynh_backup_before_upgrade
+#REMOVEME? ynh_clean_setup () {
 	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
+#REMOVEME? 	ynh_restore_upgradebackup
 }
 # Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
+#REMOVEME? ynh_abort_if_errors
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -60,8 +60,8 @@ if [ -z "$login_for_welcome" ]; then
 fi
 
 # Cleaning legacy permissions
-if ynh_legacy_permissions_exists; then
-	ynh_legacy_permissions_delete_all
+#REMOVEME? if ynh_legacy_permissions_exists; then
+#REMOVEME? 	ynh_legacy_permissions_delete_all
 
 	ynh_app_setting_delete --app=$app --key=is_public
 fi
@@ -69,10 +69,10 @@ fi
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
+#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
 
 # Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
+#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -83,7 +83,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path"
+	ynh_setup_source --dest_dir="$install_dir"
 fi
 
 #=================================================
@@ -91,10 +91,10 @@ fi
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/config.json" --destination="$final_path/config.json"
+ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
 
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # NGINX CONFIGURATION

From 214a3e6429243ccf43b08f619668d5b7a8d72eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 4 Nov 2022 21:25:34 +0100
Subject: [PATCH 02/28] v2

---
 manifest.json      | 63 ----------------------------------------------
 manifest.toml      | 11 ++++----
 scripts/backup     | 17 -------------
 scripts/change_url |  8 ------
 scripts/install    | 50 ++----------------------------------
 scripts/remove     | 28 ---------------------
 scripts/restore    | 33 ------------------------
 scripts/upgrade    | 41 +++---------------------------
 8 files changed, 10 insertions(+), 241 deletions(-)
 delete mode 100644 manifest.json

diff --git a/manifest.json b/manifest.json
deleted file mode 100644
index f921d60..0000000
--- a/manifest.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-	"name": "Element",
-	"id": "element",
-	"packaging_format": 1,
-	"description": {
-		"en": "Web client for Matrix",
-		"fr": "Client web pour Matrix"
-	},
-	"version": "1.11.13~ynh1",
-	"url": "https://element.io",
-	"upstream": {
-        "license": "Apache-2.0",
-        "website": "https://element.io",
-        "demo": "https://app.element.io/",
-        "admindoc": "https://element.io/help",
-        "code": "https://github.com/vector-im/element-web/"
-    },
-	"license": "Apache-2.0",
-	"maintainer": {
-		"name": "Josué Tille",
-		"email": "josue@tille.ch"
-	},
-	"requirements": {
-		"yunohost": ">= 4.3.0"
-	},
-	"multi_instance": true,
-	"services": [
-		"nginx"
-	],
-	"arguments": {
-		"install" : [
-			{
-				"name": "domain",
-				"type": "domain"
-			},
-			{
-				"name": "path",
-				"type": "path",
-				"example": "/element",
-				"default": "/element"
-			},
-			{
-				"name": "default_home_server",
-				"type": "string",
-				"ask": {
-					"en": "Choose a default home server",
-					"fr": "Choisissez un serveur par défault"
-				},
-				"example": "my-own-homeserver.tld",
-				"default": "matrix.org"
-			},
-			{
-				"name": "is_public",
-				"type": "boolean",
-                "help": { 
-					"en": "A public application means that anyone can access it. Note that this application provides just files (html, javascript, images, etc.)",
-					"fr": "Une application publique signifie que n'importe qui peut y accéder. Notez que cette application ne fournit que des fichiers (html, javascript, images, etc.)"
-				},
-				"default": false
-			}
-		]
-	}
-}
diff --git a/manifest.toml b/manifest.toml
index 6d2ebe2..ef0c3d2 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -15,15 +15,14 @@ website = "https://element.io"
 demo = "https://app.element.io/"
 admindoc = "https://element.io/help"
 code = "https://github.com/vector-im/element-web/"
-cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number)
-fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin.
+cpe = "cpe:2.3:a:matrix:element"
 
 [integration]
-yunohost = ">= 4.3.0"
-architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64/armel), for example: ["amd64", "i386"]
+yunohost = ">= 11.1.0"
+architectures = "all"
 multi_instance = true
-ldap = "?" # FIXME: replace with true, false, or "not_relevant"
-sso = "?" # FIXME: replace with true, false, or "not_relevant"
+ldap = "not_relevant"
+sso = "not_relevant"
 disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ...
 ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
 ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
diff --git a/scripts/backup b/scripts/backup
index 0355f43..52eea5b 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -10,23 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-#REMOVEME? ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-#REMOVEME? ynh_print_info --message="Loading installation settings..."
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
-#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
-#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
diff --git a/scripts/change_url b/scripts/change_url
index 4d5a344..ac2aeb6 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -21,14 +21,6 @@ new_path=$YNH_APP_NEW_PATH
 
 app=$YNH_APP_INSTANCE_NAME
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-# Needed for helper "ynh_add_nginx_config"
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-
 #=================================================
 # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
 #=================================================
diff --git a/scripts/install b/scripts/install
index 0db8d96..8575319 100644
--- a/scripts/install
+++ b/scripts/install
@@ -9,62 +9,27 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-#REMOVEME? ynh_abort_if_errors
-
 #=================================================
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
 # Retrieve arguments
-#REMOVEME? domain=$YNH_APP_ARG_DOMAIN
-#REMOVEME? path=$YNH_APP_ARG_PATH
-#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC
-#REMOVEME? default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
+default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER
 login_for_welcome=true
 
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
-#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1
-
-#REMOVEME? install_dir=/var/www/$app
-#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder"
-
-# Register (book) web path
-#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path
-
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1
+ynh_script_progression --message="Storing installation settings..." --weight=1
 
-#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain
-#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path
 ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
 ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=1
-
-# Create a system user
-#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=4
 
-#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
@@ -86,17 +51,6 @@ ynh_add_config --template="../conf/config.json" --destination="$install_dir/conf
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
-#=================================================
-# SETUP SSOWAT
-#=================================================
-#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=1
-
-# Make app public if necessary
-#REMOVEME? if [ $is_public -eq 1 ]
-then
-#REMOVEME? 	ynh_permission_update --permission="main" --add="visitors"
-fi
-
 #=================================================
 # RELOAD NGINX
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index c2a44db..e7f44d8 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -9,24 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
-#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
-#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
-
-#=================================================
-# REMOVE APP MAIN DIR
-#=================================================
-#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=1
-
-# Remove the app directory securely
-#REMOVEME? ynh_secure_remove --file="$install_dir"
-
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
@@ -35,16 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." --
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# REMOVE DEDICATED USER
-#=================================================
-#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=1
-
-# Delete a system user
-#REMOVEME? ynh_system_user_delete --username=$app
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index f1d1d13..38c3995 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -10,31 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Stop script if errors
-#REMOVEME? ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
-#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
-#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path)
-#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
-
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1
-
-#REMOVEME? test ! -d $install_dir || ynh_die --message="There is already a directory: $install_dir "
-
 #=================================================
 # STANDARD RESTORATION STEPS
 #=================================================
@@ -44,14 +19,6 @@ ynh_script_progression --message="Restoring the NGINX configuration..." --weight
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# RECREATE THE DEDICATED USER
-#=================================================
-#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
-
-# Create the dedicated user (if not existing)
-#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index e1c0c8f..f1901b5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,16 +12,10 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1
+ynh_script_progression --message="Loading installation settings..." --weight=1
 
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
-#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
-#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path)
-#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
-#REMOVEME? default_home_server=$(ynh_app_setting_get --app=$app --key=default_home_server)
-
-#REMOVEME? login_for_welcome=$(ynh_app_setting_get --app=$app --key=login_for_welcome)
+default_home_server=$(ynh_app_setting_get --app=$app --key=default_home_server)
+login_for_welcome=$(ynh_app_setting_get --app=$app --key=login_for_welcome)
 
 #=================================================
 # CHECK VERSION
@@ -29,20 +23,6 @@ source /usr/share/yunohost/helpers
 
 upgrade_type=$(ynh_check_app_version_changed)
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
-
-# Backup the current version of the app
-#REMOVEME? ynh_backup_before_upgrade
-#REMOVEME? ynh_clean_setup () {
-	# Restore it if the upgrade fails
-#REMOVEME? 	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-#REMOVEME? ynh_abort_if_errors
-
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -59,21 +39,6 @@ if [ -z "$login_for_welcome" ]; then
 	ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome
 fi
 
-# Cleaning legacy permissions
-#REMOVEME? if ynh_legacy_permissions_exists; then
-#REMOVEME? 	ynh_legacy_permissions_delete_all
-
-	ynh_app_setting_delete --app=$app --key=is_public
-fi
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
-
-# Create a dedicated user (if not existing)
-#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================

From b087a41eb4c20b5b69299d1481f91091f6b89de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 6 Nov 2022 19:07:03 +0100
Subject: [PATCH 03/28] Update manifest.toml

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index ef0c3d2..b0fc1f9 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -48,7 +48,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen
     help.en = "A public application means that anyone can access it. Note that this application provides just files (html, javascript, images, etc.)"
     help.fr = "Une application publique signifie que n'importe qui peut y accéder. Notez que cette application ne fournit que des fichiers (html, javascript, images, etc.)"
     type = "group"
-    default = false
+    default = "visitors"
 
 [resources]
     [resources.system_user]

From f6e5741bc912a1a1e396308f36324b20cc8f81e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 09:26:48 +0100
Subject: [PATCH 04/28] Fix

---
 manifest.toml | 8 +++-----
 tests.toml    | 0
 2 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 tests.toml

diff --git a/manifest.toml b/manifest.toml
index b0fc1f9..b9d31b5 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -23,17 +23,15 @@ architectures = "all"
 multi_instance = true
 ldap = "not_relevant"
 sso = "not_relevant"
-disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ...
-ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
-ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
+disk = "50M"
+ram.build = "50M"
+ram.runtime = "50M"
 
 [install]
     [install.domain]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "domain"
 
     [install.path]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "path"
     default = "/element"
 
diff --git a/tests.toml b/tests.toml
new file mode 100644
index 0000000..e69de29

From 4d8e8e282383cb012cbeced9ff50b988b782b001 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 3 Feb 2023 08:26:53 +0000
Subject: [PATCH 05/28] Auto-update README

---
 README.md    |  2 +-
 README_fr.md | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 4b4184e..23e3eaf 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Element for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/element.svg)](https://dash.yunohost.org/appci/app/element) ![Working status](https://ci-apps.yunohost.org/ci/badges/element.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/element.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/element.svg)](https://dash.yunohost.org/appci/app/element) ![Working status](https://ci-apps.yunohost.org/ci/badges/element.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/element.maintain.svg)
 [![Install Element with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=element)
 
 *[Lire ce readme en français.](./README_fr.md)*
diff --git a/README_fr.md b/README_fr.md
index 1c69643..fd2f6f7 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -5,15 +5,15 @@ It shall NOT be edited by hand.
 
 # Element pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/element.svg)](https://dash.yunohost.org/appci/app/element) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/element.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/element.maintain.svg)  
+[![Niveau d’intégration](https://dash.yunohost.org/integration/element.svg)](https://dash.yunohost.org/appci/app/element) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/element.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/element.maintain.svg)
 [![Installer Element avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=element)
 
 *[Read this readme in english.](./README.md)*
 
-> *Ce package vous permet d'installer Element rapidement et simplement sur un serveur YunoHost.
-Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+> *Ce package vous permet d’installer Element rapidement et simplement sur un serveur YunoHost.
+Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.*
 
-## Vue d'ensemble
+## Vue d’ensemble
 
 Element est un nouveau type d'application de messagerie. Vous choisissez où vos messages sont stockés, ce qui vous donne le contrôle de vos données. Il vous donne accès au réseau ouvert Matrix, vous pouvez donc parler à n'importe qui. Element offre un nouveau niveau de sécurité, en ajoutant la vérification des appareils par signature croisée au chiffrement de bout en bout par défaut. 
 
@@ -21,9 +21,9 @@ Element est un nouveau type d'application de messagerie. Vous choisissez où vos
 
 **Démo :** https://app.element.io/
 
-## Captures d'écran
+## Captures d’écran
 
-![Capture d'écran de Element](./doc/screenshots/homepage-all-platforms-1_1.png)
+![Capture d’écran de Element](./doc/screenshots/homepage-all-platforms-1_1.png)
 
 ## Avertissements / informations importantes
 
@@ -49,9 +49,9 @@ https://github.com/vector-im/riot-web/issues/1977 pour plus de détails.
 
 ## Documentations et ressources
 
-* Site officiel de l'app : <https://element.io>
-* Documentation officielle de l'admin : <https://element.io/help>
-* Dépôt de code officiel de l'app : <https://github.com/vector-im/element-web/>
+* Site officiel de l’app : <https://element.io>
+* Documentation officielle de l’admin : <https://element.io/help>
+* Dépôt de code officiel de l’app : <https://github.com/vector-im/element-web/>
 * Documentation YunoHost pour cette app : <https://yunohost.org/app_element>
 * Signaler un bug : <https://github.com/YunoHost-Apps/element_ynh/issues>
 
@@ -67,4 +67,4 @@ ou
 sudo yunohost app upgrade element -u https://github.com/YunoHost-Apps/element_ynh/tree/testing --debug
 ```
 
-**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
\ No newline at end of file

From 0a7805f764723e83cc80e169373f014a25f82aaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 09:27:51 +0100
Subject: [PATCH 06/28] Update manifest.toml

---
 manifest.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index b9d31b5..5b9e57f 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -21,8 +21,8 @@ cpe = "cpe:2.3:a:matrix:element"
 yunohost = ">= 11.1.0"
 architectures = "all"
 multi_instance = true
-ldap = "not_relevant"
-sso = "not_relevant"
+ldap = false
+sso = true
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"

From 3471b9c160044139471bb7b97750cf9227e83d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 09:30:57 +0100
Subject: [PATCH 07/28] Update manifest.toml

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 5b9e57f..e752f91 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Element"
 description.en = "Web client for Matrix"
 description.fr = "Client web pour Matrix"
 
-version = "1.11.13~ynh1"
+version = "1.11.22~ynh1"
 
 maintainers = ["Josué Tille"]
 

From b8052810ef33bcfd34138713047f15acf5689eaf Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 3 Feb 2023 08:31:03 +0000
Subject: [PATCH 08/28] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 23e3eaf..19f1a15 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Element is a new type of messaging app. You choose where your messages are stored, putting you in control of your data. It gives you access to the Matrix open network, so you can talk to anyone. Element provides a new level of security, adding cross-signed device verification to default end-to-end encryption.
 
-**Shipped version:** 1.11.13~ynh1
+**Shipped version:** 1.11.22~ynh1
 
 **Demo:** https://app.element.io/
 
diff --git a/README_fr.md b/README_fr.md
index fd2f6f7..f3eb8a5 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,7 +17,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Element est un nouveau type d'application de messagerie. Vous choisissez où vos messages sont stockés, ce qui vous donne le contrôle de vos données. Il vous donne accès au réseau ouvert Matrix, vous pouvez donc parler à n'importe qui. Element offre un nouveau niveau de sécurité, en ajoutant la vérification des appareils par signature croisée au chiffrement de bout en bout par défaut. 
 
-**Version incluse :** 1.11.13~ynh1
+**Version incluse :** 1.11.22~ynh1
 
 **Démo :** https://app.element.io/
 

From 196fb973f882d124090695509257e66fa53bfa8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 09:32:18 +0100
Subject: [PATCH 09/28] Fix

---
 doc/DISCLAIMER.md    | 19 -------------------
 doc/DISCLAIMER_fr.md | 19 -------------------
 tests.toml           |  9 +++++++++
 3 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 doc/DISCLAIMER.md
 delete mode 100644 doc/DISCLAIMER_fr.md

diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
deleted file mode 100644
index 22d6e95..0000000
--- a/doc/DISCLAIMER.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## YunoHost specific features
-
-### Multi-users support
-
-This application support the SSO. If you want to use the SSO, you need to define the path to the default homeserver as your homeserver witch is installed on your YunoHost instance.
-
-## Additional informations
-
-### Important Security Note
-
-We do not recommend running Element from the same domain name as your Matrix
-homeserver (Synapse).  The reason is the risk of XSS (cross-site-scripting)
-vulnerabilities that could occur if someone caused Element to load and render
-malicious user generated content from a Matrix API which then had trusted
-access to Element (or other apps) due to sharing the same domain.
-
-We have put some coarse mitigations into place to try to protect against this
-situation, but it's still not good practice to do it in the first place.  See
-https://github.com/vector-im/riot-web/issues/1977 for more details.
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
deleted file mode 100644
index 0ac8dd8..0000000
--- a/doc/DISCLAIMER_fr.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## Fonctionnalités spécifiques à YunoHost
-
-### Prise en charge multi-utilisateurs
-
-Cette application prend en charge le SSO. Si vous souhaitez utiliser le SSO, vous devez définir le chemin d'accès au serveur domestique par défaut car votre serveur domestique est installé sur votre instance YunoHost.
-
-## Informations supplémentaires
-
-### Note de sécurité importante
-
-Nous vous déconseillons d'exécuter Element à partir du même nom de domaine que votre Matrix
-serveur domestique (Synapse). La raison en est le risque de XSS (cross-site-scripting)
-vulnérabilités qui pourraient survenir si quelqu'un provoquait le chargement et le rendu d'Element
-un utilisateur malveillant a généré du contenu à partir d'une API Matrix qui avait alors fait confiance
-accès à Element (ou à d'autres applications) en raison du partage du même domaine.
-
-Nous avons mis en place des mesures d'atténuation grossières pour essayer de nous protéger contre ce
-situation, mais ce n'est toujours pas une bonne pratique de le faire en premier lieu. Voir
-https://github.com/vector-im/riot-web/issues/1977 pour plus de détails.
diff --git a/tests.toml b/tests.toml
index e69de29..cfb7391 100644
--- a/tests.toml
+++ b/tests.toml
@@ -0,0 +1,9 @@
+test_format = 1.0
+
+[default]
+
+    exclude = [
+        "install.nourl"
+    ]
+
+    test_upgrade_from.d653976.name = "Upgrade from 23.01"

From f7c370f8d93f9356624a555f495186d423430e75 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 3 Feb 2023 08:32:28 +0000
Subject: [PATCH 10/28] Auto-update README

---
 README.md    | 22 ----------------------
 README_fr.md | 22 ----------------------
 2 files changed, 44 deletions(-)

diff --git a/README.md b/README.md
index 19f1a15..6388529 100644
--- a/README.md
+++ b/README.md
@@ -25,28 +25,6 @@ Element is a new type of messaging app. You choose where your messages are store
 
 ![Screenshot of Element](./doc/screenshots/homepage-all-platforms-1_1.png)
 
-## Disclaimers / important information
-
-## YunoHost specific features
-
-### Multi-users support
-
-This application support the SSO. If you want to use the SSO, you need to define the path to the default homeserver as your homeserver witch is installed on your YunoHost instance.
-
-## Additional informations
-
-### Important Security Note
-
-We do not recommend running Element from the same domain name as your Matrix
-homeserver (Synapse).  The reason is the risk of XSS (cross-site-scripting)
-vulnerabilities that could occur if someone caused Element to load and render
-malicious user generated content from a Matrix API which then had trusted
-access to Element (or other apps) due to sharing the same domain.
-
-We have put some coarse mitigations into place to try to protect against this
-situation, but it's still not good practice to do it in the first place.  See
-https://github.com/vector-im/riot-web/issues/1977 for more details.
-
 ## Documentation and resources
 
 * Official app website: <https://element.io>
diff --git a/README_fr.md b/README_fr.md
index f3eb8a5..cc3a4b1 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -25,28 +25,6 @@ Element est un nouveau type d'application de messagerie. Vous choisissez où vos
 
 ![Capture d’écran de Element](./doc/screenshots/homepage-all-platforms-1_1.png)
 
-## Avertissements / informations importantes
-
-## Fonctionnalités spécifiques à YunoHost
-
-### Prise en charge multi-utilisateurs
-
-Cette application prend en charge le SSO. Si vous souhaitez utiliser le SSO, vous devez définir le chemin d'accès au serveur domestique par défaut car votre serveur domestique est installé sur votre instance YunoHost.
-
-## Informations supplémentaires
-
-### Note de sécurité importante
-
-Nous vous déconseillons d'exécuter Element à partir du même nom de domaine que votre Matrix
-serveur domestique (Synapse). La raison en est le risque de XSS (cross-site-scripting)
-vulnérabilités qui pourraient survenir si quelqu'un provoquait le chargement et le rendu d'Element
-un utilisateur malveillant a généré du contenu à partir d'une API Matrix qui avait alors fait confiance
-accès à Element (ou à d'autres applications) en raison du partage du même domaine.
-
-Nous avons mis en place des mesures d'atténuation grossières pour essayer de nous protéger contre ce
-situation, mais ce n'est toujours pas une bonne pratique de le faire en premier lieu. Voir
-https://github.com/vector-im/riot-web/issues/1977 pour plus de détails.
-
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://element.io>

From 1fffe6052efdef30a0a3a5c4a465b42c62226ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 09:39:39 +0100
Subject: [PATCH 11/28] Fix

---
 check_process   | 24 ------------------------
 scripts/restore |  4 ++--
 scripts/upgrade |  4 ++--
 tests.toml      | 18 +++++++++++++++---
 4 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 check_process

diff --git a/check_process b/check_process
deleted file mode 100644
index ec0f0de..0000000
--- a/check_process
+++ /dev/null
@@ -1,24 +0,0 @@
-;; Test complet
-    ; Manifest
-        domain="domain.tld"
-        path="/path"
-        default_home_server="matrix.org"
-        is_public=1
-    ; Checks
-        pkg_linter=1
-        setup_sub_dir=1
-        setup_root=1
-        setup_nourl=0
-        setup_private=1
-        setup_public=1
-        upgrade=1
-        upgrade=1   from_commit=34d457d13e526997fddb8348650674a7db2247be
-        backup_restore=1
-        multi_instance=1
-        change_url=1
-;;; Upgrade options
-    ; commit=Sep 13, 2021
-        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
diff --git a/scripts/restore b/scripts/restore
index 38c3995..d1d9a3e 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -26,8 +26,8 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
+#chmod -R o-rwx "$install_dir"
+#chown -R $app:www-data "$install_dir"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index f1901b5..0f37167 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -58,8 +58,8 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
 
 ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
 
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
+#chmod -R o-rwx "$install_dir"
+#chown -R $app:www-data "$install_dir"
 
 #=================================================
 # NGINX CONFIGURATION
diff --git a/tests.toml b/tests.toml
index cfb7391..276998c 100644
--- a/tests.toml
+++ b/tests.toml
@@ -2,8 +2,20 @@ test_format = 1.0
 
 [default]
 
-    exclude = [
-        "install.nourl"
-    ]
+    # ------------
+    # Tests to run
+    # ------------
+
+    exclude ="install.nourl"
+
+    # -------------------------------
+    # Default args to use for install
+    # -------------------------------
+
+    default_home_server="matrix.org"
+
+    # -------------------------------
+    # Commits to test upgrade from
+    # -------------------------------
 
     test_upgrade_from.d653976.name = "Upgrade from 23.01"

From c84aa6388b2331c28731901eb5700df38b4d2372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 10:13:11 +0100
Subject: [PATCH 12/28] Fix linter

---
 scripts/install | 7 -------
 scripts/upgrade | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/scripts/install b/scripts/install
index 8575319..6c61422 100644
--- a/scripts/install
+++ b/scripts/install
@@ -51,13 +51,6 @@ ynh_add_config --template="../conf/config.json" --destination="$install_dir/conf
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 0f37167..297e885 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -69,13 +69,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================

From 0049d5f68e4702c7ef0f82d1208ce953885cb512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 10:14:06 +0100
Subject: [PATCH 13/28] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 6c61422..f42fe7d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -48,8 +48,8 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
 
 ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
 
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
+#chmod -R o-rwx "$install_dir"
+#chown -R $app:www-data "$install_dir"
 
 #=================================================
 # END OF SCRIPT

From 4faa40f4c435c1255ee808f004dbf85b195e9fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 10:16:49 +0100
Subject: [PATCH 14/28] Fix

---
 .kateproject     | 4 ----
 conf/config.json | 2 +-
 manifest.toml    | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 .kateproject

diff --git a/.kateproject b/.kateproject
deleted file mode 100644
index d945148..0000000
--- a/.kateproject
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-"name": "Element_ynh"
-, "files": [ { "git": 1 } ]
-}
diff --git a/conf/config.json b/conf/config.json
index f76fdf8..a1c1ad3 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -17,6 +17,6 @@
         "https://matrix-client.matrix.org": false
     },
     "embedded_pages": {
-        "login_for_welcome": __LOGIN_FOR_WELCOME__
+        "login_for_welcome": "__LOGIN_FOR_WELCOME__"
     }
 }
diff --git a/manifest.toml b/manifest.toml
index e752f91..38bd3a3 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -18,7 +18,7 @@ code = "https://github.com/vector-im/element-web/"
 cpe = "cpe:2.3:a:matrix:element"
 
 [integration]
-yunohost = ">= 11.1.0"
+yunohost = ">= 11.1.5"
 architectures = "all"
 multi_instance = true
 ldap = false

From cb5ec1d5e9716ec5c193f9460e5740a19270a19d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 10:26:40 +0100
Subject: [PATCH 15/28] Fix

---
 scripts/install |  5 +++--
 scripts/restore |  5 +++--
 scripts/upgrade | 13 +++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/scripts/install b/scripts/install
index f42fe7d..b6205b1 100644
--- a/scripts/install
+++ b/scripts/install
@@ -48,8 +48,9 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
 
 ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
 
-#chmod -R o-rwx "$install_dir"
-#chown -R $app:www-data "$install_dir"
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/restore b/scripts/restore
index d1d9a3e..fbc70ff 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -26,8 +26,9 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-#chmod -R o-rwx "$install_dir"
-#chown -R $app:www-data "$install_dir"
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 297e885..42e2d25 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -48,18 +48,19 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir"
+	ynh_setup_source --dest_dir="$install_dir" --keep="config.json"
 fi
 
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
+
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-ynh_script_progression --message="Adding a configuration file..." --weight=1
+#ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
-
-#chmod -R o-rwx "$install_dir"
-#chown -R $app:www-data "$install_dir"
+#ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
 
 #=================================================
 # NGINX CONFIGURATION

From 3ad629160f5deb832b3c5864d5a955087f767817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 10:30:10 +0100
Subject: [PATCH 16/28] Update change_url

---
 scripts/change_url | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/change_url b/scripts/change_url
index ac2aeb6..4ac066b 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -82,6 +82,7 @@ then
 	# Store file checksum for the new config file location
 	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
 fi
+
 #=================================================
 # RELOAD NGINX
 #=================================================

From c8e6e71186b35e2179ed328ae3c78bdcd64c759d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 13:03:41 +0100
Subject: [PATCH 17/28] Fix

---
 scripts/install |  6 +++++-
 scripts/restore | 12 ++++++++----
 scripts/upgrade | 12 ++++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/scripts/install b/scripts/install
index b6205b1..3c653cc 100644
--- a/scripts/install
+++ b/scripts/install
@@ -48,7 +48,11 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
 
 ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
 
-chmod 750 "$install_dir"
+#=================================================
+# SECURE FILES AND DIRECTORIES
+#=================================================
+
+# Set permissions to app files
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
diff --git a/scripts/restore b/scripts/restore
index fbc70ff..ed2f094 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -26,10 +26,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$install_dir"
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
@@ -39,6 +35,14 @@ ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
+#=================================================
+# SECURE FILES AND DIRECTORIES
+#=================================================
+
+# Set permissions to app files
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 42e2d25..24b1307 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -51,10 +51,6 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep="config.json"
 fi
 
-chmod 750 "$install_dir"
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
@@ -70,6 +66,14 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+#=================================================
+# SECURE FILES AND DIRECTORIES
+#=================================================
+
+# Set permissions to app files
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
+
 #=================================================
 # END OF SCRIPT
 #=================================================

From 9d1e7203a2ca3085a7b9332ab10a7c3ff4c00c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 3 Feb 2023 18:42:37 +0100
Subject: [PATCH 18/28] Update tests.toml

---
 tests.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests.toml b/tests.toml
index 276998c..b8493de 100644
--- a/tests.toml
+++ b/tests.toml
@@ -12,7 +12,7 @@ test_format = 1.0
     # Default args to use for install
     # -------------------------------
 
-    default_home_server="matrix.org"
+    args.default_home_server="matrix.org"
 
     # -------------------------------
     # Commits to test upgrade from

From 308d25c7ccdb63a25c897aeea9eca8ada991dcc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 4 Feb 2023 13:56:54 +0100
Subject: [PATCH 19/28] Update config_panel.toml

---
 config_panel.toml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/config_panel.toml b/config_panel.toml
index 80cb82f..c60f78f 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -1,15 +1,19 @@
 version = "1.0"
 
 [main]
-name = "Element configuration"
+name.en = "Element configuration"
+name.fr = "Configuration d'Element"
 
     [main.config]
-    name = "Configuration Options"
+    name.en = "Configuration Options"
+    name.fr = "Options de configuration"
 
         [main.config.login_for_welcome]
-        ask = "Display login as welcome page"
+        ask.en = "Display login as welcome page"
+        ask.fr = "Afficher la connexion comme page d'accueil"
         type = "boolean"
         yes = true
         no = false
-        help = "When true, the app will use the login form as a welcome page instead of the welcome page itself. This disables use of welcome_url and all welcome page functionality."
+        help.en = "When true, the app will use the login form as a welcome page instead of the welcome page itself. This disables use of welcome_url and all welcome page functionality."
+        help.fr = "Lorsque la valeur est 'oui', l'application utilisera le formulaire de connexion comme page d'accueil au lieu de la page d'accueil elle-même. Cela désactive l'utilisation de 'welcome_url' et de toutes les fonctionnalités de la page d'accueil."
         bind = "login_for_welcome:/var/www/__APP__/config.json"

From b4745fda8ed1bb49631a6141de2997e01640a550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 5 Feb 2023 20:45:09 +0100
Subject: [PATCH 20/28] Update upgrade

---
 scripts/upgrade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 24b1307..d5f20e9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -48,15 +48,15 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --keep="config.json"
+	ynh_setup_source --dest_dir="$install_dir" #--keep="config.json"
 fi
 
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-#ynh_script_progression --message="Adding a configuration file..." --weight=1
+ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-#ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
+ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json"
 
 #=================================================
 # NGINX CONFIGURATION

From 302dfec05052d448cdd97dc30b84050669255d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 5 Feb 2023 20:53:53 +0100
Subject: [PATCH 21/28] Update config_panel.toml

---
 config_panel.toml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/config_panel.toml b/config_panel.toml
index c60f78f..0e63f57 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -5,15 +5,19 @@ name.en = "Element configuration"
 name.fr = "Configuration d'Element"
 
     [main.config]
-    name.en = "Configuration Options"
-    name.fr = "Options de configuration"
+    name = "Configuration Options"
+
+        [main.config.default_home_server]
+        ask = "Default Home Server"
+        type = "string"
+        default = "matrix.org"
+        help = "Define the Default Home Server."
+        bind = "default_home_server:/var/www/__APP__/config.json"
 
         [main.config.login_for_welcome]
-        ask.en = "Display login as welcome page"
-        ask.fr = "Afficher la connexion comme page d'accueil"
+        ask = "Display login as welcome page"
         type = "boolean"
         yes = true
         no = false
-        help.en = "When true, the app will use the login form as a welcome page instead of the welcome page itself. This disables use of welcome_url and all welcome page functionality."
-        help.fr = "Lorsque la valeur est 'oui', l'application utilisera le formulaire de connexion comme page d'accueil au lieu de la page d'accueil elle-même. Cela désactive l'utilisation de 'welcome_url' et de toutes les fonctionnalités de la page d'accueil."
+        help = "When true, the app will use the login form as a welcome page instead of the welcome page itself. This disables use of welcome_url and all welcome page functionality."
         bind = "login_for_welcome:/var/www/__APP__/config.json"

From 2ed4b0e26afcb7892e99f717d5984f3d2385b5bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 5 Feb 2023 21:14:05 +0100
Subject: [PATCH 22/28] Update config_panel.toml

---
 config_panel.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config_panel.toml b/config_panel.toml
index 0e63f57..ac5a59e 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -1,8 +1,7 @@
 version = "1.0"
 
 [main]
-name.en = "Element configuration"
-name.fr = "Configuration d'Element"
+name = "Element configuration"
 
     [main.config]
     name = "Configuration Options"

From 51b3be266600a49a79bf5d3a6d3a5f8fe5425366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 5 Feb 2023 21:18:41 +0100
Subject: [PATCH 23/28] Update config_panel.toml

---
 config_panel.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config_panel.toml b/config_panel.toml
index ac5a59e..b1b6bd9 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -11,7 +11,7 @@ name = "Element configuration"
         type = "string"
         default = "matrix.org"
         help = "Define the Default Home Server."
-        bind = "default_home_server:/var/www/__APP__/config.json"
+        bind = "base_url:/var/www/__APP__/config.json"
 
         [main.config.login_for_welcome]
         ask = "Display login as welcome page"

From 14104234d4a2f0fbe284d880b544b99843683e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 5 Feb 2023 21:23:53 +0100
Subject: [PATCH 24/28] Update config_panel.toml

---
 config_panel.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config_panel.toml b/config_panel.toml
index b1b6bd9..e1bd81e 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -11,7 +11,7 @@ name = "Element configuration"
         type = "string"
         default = "matrix.org"
         help = "Define the Default Home Server."
-        bind = "base_url:/var/www/__APP__/config.json"
+        bind = ":/var/www/__APP__/config.json"
 
         [main.config.login_for_welcome]
         ask = "Display login as welcome page"

From aab0aff985e7997413ced5d3bf51c910e285c613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 5 Feb 2023 22:06:06 +0100
Subject: [PATCH 25/28] fix

---
 conf/config.json  | 8 ++++++--
 config_panel.toml | 7 -------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/conf/config.json b/conf/config.json
index a1c1ad3..0d2955f 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -1,7 +1,11 @@
 {
     "default_server_config": {
-        "m.homeserver": { "base_url": "https://__DEFAULT_HOME_SERVER__" },
-        "m.identity_server": {"base_url": "https://vector.im"}
+        "m.homeserver": {
+            "base_url": "https://__DEFAULT_HOME_SERVER__"
+        },
+        "m.identity_server": {
+            "base_url": "https://vector.im"
+        }
     },
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
diff --git a/config_panel.toml b/config_panel.toml
index e1bd81e..80cb82f 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -6,13 +6,6 @@ name = "Element configuration"
     [main.config]
     name = "Configuration Options"
 
-        [main.config.default_home_server]
-        ask = "Default Home Server"
-        type = "string"
-        default = "matrix.org"
-        help = "Define the Default Home Server."
-        bind = ":/var/www/__APP__/config.json"
-
         [main.config.login_for_welcome]
         ask = "Display login as welcome page"
         type = "boolean"

From d04f5d66c55acf4b2dbbdc2c973d1285c38ccb2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:05:05 +0100
Subject: [PATCH 26/28] Update upgrade

---
 scripts/upgrade | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index d5f20e9..90bfe7f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,10 +12,10 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
+#ynh_script_progression --message="Loading installation settings..." --weight=1
 
-default_home_server=$(ynh_app_setting_get --app=$app --key=default_home_server)
-login_for_welcome=$(ynh_app_setting_get --app=$app --key=login_for_welcome)
+#default_home_server=$(ynh_app_setting_get --app=$app --key=default_home_server)
+#login_for_welcome=$(ynh_app_setting_get --app=$app --key=login_for_welcome)
 
 #=================================================
 # CHECK VERSION
@@ -29,12 +29,12 @@ upgrade_type=$(ynh_check_app_version_changed)
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 # If default_home_server doesn't exist, create it
-if [ -z "$default_home_server" ]; then
+if [ -z "${default_home_server:-}" ]; then
 	default_home_server="matrix.org"
 	ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
 fi
 
-if [ -z "$login_for_welcome" ]; then
+if [ -z "${login_for_welcome:-}" ]; then
 	login_for_welcome=true
 	ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome
 fi

From bf02f365d7b4befca37ae6d6a8ed38e0b32f56ab Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Tue, 14 Feb 2023 10:05:10 +0000
Subject: [PATCH 27/28] Auto-update README

---
 README.md    | 1 +
 README_fr.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 6388529..0dceab3 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ It shall NOT be edited by hand.
 # Element for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/element.svg)](https://dash.yunohost.org/appci/app/element) ![Working status](https://ci-apps.yunohost.org/ci/badges/element.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/element.maintain.svg)
+
 [![Install Element with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=element)
 
 *[Lire ce readme en français.](./README_fr.md)*
diff --git a/README_fr.md b/README_fr.md
index cc3a4b1..8353745 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -6,6 +6,7 @@ It shall NOT be edited by hand.
 # Element pour YunoHost
 
 [![Niveau d’intégration](https://dash.yunohost.org/integration/element.svg)](https://dash.yunohost.org/appci/app/element) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/element.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/element.maintain.svg)
+
 [![Installer Element avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=element)
 
 *[Read this readme in english.](./README.md)*

From 5c6e4ca40f65e0963865c31c6fe889af7618a494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:30:58 +0100
Subject: [PATCH 28/28] Update manifest.toml

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 38bd3a3..b977ccc 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -18,7 +18,7 @@ code = "https://github.com/vector-im/element-web/"
 cpe = "cpe:2.3:a:matrix:element"
 
 [integration]
-yunohost = ">= 11.1.5"
+yunohost = ">= 11.1.6"
 architectures = "all"
 multi_instance = true
 ldap = false