From 2a1ec09a8790ebba3a91f63be0332a50fec32d2a Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:03:33 +0100
Subject: [PATCH 01/24] First commit V2

---
 check_process        | 25 ------------
 conf/nginx.conf      |  1 +
 doc/DISCLAIMER.md    | 21 ----------
 doc/DISCLAIMER_fr.md | 21 ----------
 manifest.json        | 46 ---------------------
 scripts/backup       | 22 +---------
 scripts/install      | 97 ++++++--------------------------------------
 scripts/remove       | 21 ----------
 scripts/restore      | 55 +++----------------------
 scripts/upgrade      | 55 +++++++------------------
 10 files changed, 36 insertions(+), 328 deletions(-)
 delete mode 100644 check_process
 delete mode 100644 doc/DISCLAIMER.md
 delete mode 100644 doc/DISCLAIMER_fr.md
 delete mode 100644 manifest.json

diff --git a/check_process b/check_process
deleted file mode 100644
index 43ab1de..0000000
--- a/check_process
+++ /dev/null
@@ -1,25 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		is_public=1
-
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=0
-		setup_root=1
-		setup_nourl=0
-		setup_private=1
-		setup_public=1
-		upgrade=1
-		# v13.0.5
-		upgrade=1	from_commit=89f4f52e3cb3c9daf8eff43aab67bcda475da410
-		backup_restore=1
-		multi_instance=0
-		change_url=0
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=CommitHash
-		name=Name and date of the commit.
-		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666&
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 32ad407..b62c14a 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,6 +1,7 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
+
   proxy_pass http://127.0.0.1:__PORT__;
   proxy_set_header Host $host;
   proxy_set_header X-Real-IP $remote_addr;
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
deleted file mode 100644
index 30a50d5..0000000
--- a/doc/DISCLAIMER.md
+++ /dev/null
@@ -1,21 +0,0 @@
-### Important points to read before installing
-
-- *Calckey* requires a dedicated root domain, e.g. `Calckey.domain.tld`
-- Due to Cypress dependency, *Calckey* only works on 64-bit CPU machines.
-- *Calckey* can take quite some time to install (more then 30 minutes). So take out some time and grab yourself a coffee.
-- If installing from command line, using `screen` is recommended to avoid disconnection. See below.
-- After installation, first page can take time to load and may show timeout error. Give it time to make itself ready for you. Refresh the page after 2 or 3 minutes.
-- The first account created will be an admin user and will have all the admin rights.
-
-Using screen in case of disconnects
-
-``` 
-sudo apt-get install screen
-screen
-sudo yunohost app install https://github.com/YunoHost-Apps/Calckey_ynh.git
-```
-Recover after disconnect:
-```
-screen -d
-screen -r
-```
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
deleted file mode 100644
index a63adab..0000000
--- a/doc/DISCLAIMER_fr.md
+++ /dev/null
@@ -1,21 +0,0 @@
-### Points importants à lire avant l'installation
-
-- *Calckey* nécessite un domaine racine dédié, par ex. `Calckey.domain.tld`
-- En raison de la dépendance de Cypress, *Calckey* ne fonctionne que sur les machines à processeur 64 bits.
-- *Calckey* peut prendre un certain temps à installer (plus de 30 minutes). Alors prenez un peu de temps et prenez un café.
-- Si l'installation à partir de la ligne de commande, l'utilisation de l'écran est réenregistrée pour éviter la déconnexion. Voir ci-dessous.
-- Après l'installation, la première page peut prendre du temps à charger et peut afficher une erreur de délai d'attente. Donnez-lui le temps de se préparer pour vous. Actualiser la page après 2-3 minutes.
-- Le premier compte créé sera un utilisateur administrateur et disposera de tous les droits d'administrateur.
-
-Utiliser *screen* en cas de déconnexion
-
-``` 
-sudo apt-get install screen
-screen
-sudo yunohost app install https://github.com/YunoHost-Apps/Calckey_ynh.git
-```
-Récupérer après déconnexion :
-```
-screen -d
-screen -r
-```
diff --git a/manifest.json b/manifest.json
deleted file mode 100644
index bbfeb05..0000000
--- a/manifest.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "name": "Calckey",
-    "id": "calckey",
-    "packaging_format": 1,
-    "description": {
-        "en": "Fork of Misskey with better UI/UX, security, features",
-        "fr": "Un fork de Misskey avec une meilleure interface utilisateur, la sécurité, les fonctionnalités"
-    },
-    "version": "13.1.2~ynh1",
-    "url": "https://i.calckey.cloud/",
-    "upstream": {
-        "license": "AGPL-3.0",
-        "website": "https://i.calckey.cloud/",
-        "demo": "https://i.calckey.cloud/",
-        "code": "https://codeberg.org/calckey/calckey"
-    },
-    "license": "AGPL-3.0",
-    "maintainer": {
-        "name": "oufmilo"
-    },
-    "requirements": {
-        "yunohost": ">= 11.0.0"
-    },
-    "multi_instance": false,
-    "services": [
-        "nginx"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "help": {
-                    "en": "If enabled, Calckey will be accessible by people who do not have an account. This can be changed later via the webadmin.",
-                    "fr": "Si cette case est cochée, Calckey sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
-                },
-                "default": true
-            }
-        ]
-    }
-}
diff --git a/scripts/backup b/scripts/backup
index 37a5e95..b88b274 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -10,26 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	true
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_print_info --message="Loading installation settings..."
-
-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)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -40,7 +20,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 b2b6dea..1f011ea 100644
--- a/scripts/install
+++ b/scripts/install
@@ -9,50 +9,11 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	ynh_clean_check_starting
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-domain=$YNH_APP_ARG_DOMAIN
-path_url="/"
-is_public=$YNH_APP_ARG_IS_PUBLIC
 
-app=$YNH_APP_INSTANCE_NAME
-
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
-ynh_script_progression --message="Validating installation parameters..." --weight=1
-
-# Check machine architecture (in particular, we don't support ARM and 32bit machines)
-if [ $YNH_ARCH != "amd64" ] && [ $YNH_ARCH != "aarch64" ] && [ $YNH_ARCH != "arm64" ]
-then
-	ynh_die --message="Sorry, but this app can only be installed on a 64 bits machine :("
-fi
-
-final_path=/var/www/$app
-test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-
-# Register (book) web path
-ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
-
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-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
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -74,37 +35,14 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=2
-
-# Create a system user
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
-#=================================================
-# CREATE A POSTGRESQL DATABASE
-#=================================================
-ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2
-
-db_name=$(ynh_sanitize_dbid --db_name=$app)
-db_user=$db_name
-ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=3
 
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path"
-
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
+ynh_setup_source --dest_dir="$install_dir"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -123,20 +61,28 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
 redis_db=$(ynh_redis_get_free_db)
 ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
 
-ynh_add_config --template="../conf/default.yml" --destination="$final_path/.config/default.yml"
+ynh_add_config --template="../conf/default.yml" --destination="$install_dir/.config/default.yml"
+
+#=================================================
+# SECURE FILES AND DIRECTORIES
+#=================================================
+
+# Set permissions to app files
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # BUILD APP
 #=================================================
 ynh_script_progression --message="Building app... This will take some time." --weight=15
 
-pushd "$final_path"
+pushd "$install_dir"
 	ynh_use_nodejs
 	corepack enable
 	corepack prepare pnpm@latest --activate
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm install
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run init
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init
 popd
 
 #=================================================
@@ -171,23 +117,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="All workers started"
 
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=1
-
-# Make app public if necessary
-if [ $is_public -eq 1 ]
-then
-	ynh_permission_update --permission="main" --add="visitors"
-fi
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..."
-
-ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/remove b/scripts/remove
index b4d4187..374019a 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -9,19 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..."
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-port=$(ynh_app_setting_get --app=$app --key=port)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-redis_db=$(ynh_app_setting_get --app=$app --key=redis_db)
 
 #=================================================
 # STANDARD REMOVE
@@ -67,14 +54,6 @@ ynh_script_progression --message="Removing the redis database..." --weight=1
 
 ynh_redis_remove_db "$redis_db"
 
-#=================================================
-# REMOVE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Removing app main directory..." --weight=1
-
-# Remove the app directory securely
-ynh_secure_remove --file="$final_path"
-
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 2e6e9c9..4581a6f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -10,58 +10,16 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	ynh_clean_check_starting
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..."
-
-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)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
-
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-ynh_script_progression --message="Validating restoration parameters..." --weight=1
-
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
-
 #=================================================
 # STANDARD RESTORATION STEPS
 #=================================================
-# RECREATE THE DEDICATED USER
-#=================================================
-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"
 
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
 ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
-ynh_restore_file --origin_path="$final_path"
-
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
+ynh_restore_file --origin_path="$install_dir"
 
 #=================================================
 # SPECIFIC RESTORATION
@@ -80,7 +38,7 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Reinstalling pnpm..." --weight=1
 
 # Define and install pnpm
-pushd "$final_path"
+pushd "$install_dir"
 	ynh_use_nodejs
 	corepack enable
 	corepack prepare pnpm@latest --activate
@@ -96,13 +54,12 @@ ynh_script_progression --message="Restoring the NGINX web server configuration..
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
-# RESTORE THE POSTGRESQL DATABASE
+# SECURE FILES AND DIRECTORIES
 #=================================================
-ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1
 
-ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
-ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
+# Set permissions to app files
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # RESTORE SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index ed1c22f..0e9934e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,19 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-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)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
-port=$(ynh_app_setting_get --app=$app --key=port)
 
 #=================================================
 # CHECK VERSION
@@ -75,28 +62,12 @@ if [ -z "$db_name" ]; then
 	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 fi
 
-# If final_path doesn't exist, create it
-if [ -z "$final_path" ]; then
-	final_path=/var/www/$app
-	ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+# If install_dir doesn't exist, create it
+if [ -z "$install_dir" ]; then
+	install_dir=/var/www/$app
+	ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir
 fi
 
-# Cleaning legacy permissions
-if ynh_legacy_permissions_exists; then
-	ynh_legacy_permissions_delete_all
-
-	ynh_app_setting_delete --app=$app --key=is_public
-fi
-
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-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"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -106,13 +77,9 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep=".config/default.yml"
+	ynh_setup_source --dest_dir="$install_dir" --keep=".config/default.yml"
 fi
 
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@@ -123,7 +90,7 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 # REMOVE YARN (upgrade from 13.0.x to 13.1.x)
 ynh_script_progression --message="Removing old version dependency..."
-ynh_secure_remove --file="$final_path/.yarn"
+ynh_secure_remove --file="$install_dir/.yarn"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -138,7 +105,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building app..."
 
-pushd "$final_path"
+pushd "$install_dir"
     corepack enable
     corepack prepare pnpm@latest --activate
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm clean-all
@@ -186,6 +153,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
 #=================================================

From 32542f63c432d594b234f7015db82210daf399af Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:06:20 +0100
Subject: [PATCH 02/24] Add manifest.toml

---
 manifest.toml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 manifest.toml

diff --git a/manifest.toml b/manifest.toml
new file mode 100644
index 0000000..12207a9
--- /dev/null
+++ b/manifest.toml
@@ -0,0 +1,55 @@
+packaging_format = 2
+
+id = "calckey"
+name = "Calckey"
+description.en = "Fork of Misskey with better UI/UX, security, features"
+description.fr = "Un fork de Misskey avec une meilleure interface utilisateur, la sécurité, les fonctionnalités"
+
+version = "13.1.2~ynh1"
+
+maintainers = ["oufmilo"]
+
+[upstream]
+license = "AGPL-3.0"
+website = "https://i.calckey.cloud/"
+demo = "https://i.calckey.cloud/"
+code = "https://codeberg.org/calckey/calckey"
+
+[integration]
+yunohost = ">= 11.0.0"
+architectures = "all" 
+multi_instance = false
+ldap = "false" 
+sso = "false" 
+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"
+    full_domain = true
+
+    [install.init_main_permission]
+    help.en = "If enabled, Calckey will be accessible by people who do not have an account. This can be changed later via the webadmin."
+    help.fr = "Si cette case est cochée, Calckey sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+    type = "group"
+    default = "visitors"
+
+[resources]
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.permissions]
+    main.url = "/"
+
+    [resources.ports]
+    main.default = 3020
+
+    [resources.apt]
+    packages = "ffmpeg, postgresql, build-essential"
+
+    [resources.database]
+    type = "postgresql"
\ No newline at end of file

From 8bc5d100150cd22cb81fa4c30b5e80196d47a721 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:15:51 +0100
Subject: [PATCH 03/24] Add test.toml

---
 test.toml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 test.toml

diff --git a/test.toml b/test.toml
new file mode 100644
index 0000000..0ef210b
--- /dev/null
+++ b/test.toml
@@ -0,0 +1,19 @@
+test_format = 1.0
+
+[default]
+
+    # ------------
+    # Tests to run
+    # ------------
+
+    exclude ="install.nourl"
+
+    # -------------------------------
+    # Default args to use for install
+    # -------------------------------
+
+    # -------------------------------
+    # Commits to test upgrade from
+    # -------------------------------
+
+    test_upgrade_from.89f4f52.name = "Upgrade from 13.0.5"
\ No newline at end of file

From 6211ac021c6a7f11ab51fd8646968ba6467b952e Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:22:27 +0100
Subject: [PATCH 04/24] Fix

---
 scripts/install | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/install b/scripts/install
index 1f011ea..d1a2e30 100644
--- a/scripts/install
+++ b/scripts/install
@@ -44,6 +44,14 @@ ynh_script_progression --message="Setting up source files..." --weight=3
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
+#=================================================
+# SECURE FILES AND DIRECTORIES
+#=================================================
+
+# Set permissions to app files
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -63,14 +71,6 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
 
 ynh_add_config --template="../conf/default.yml" --destination="$install_dir/.config/default.yml"
 
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
 #=================================================
 # BUILD APP
 #=================================================

From 8d4900c4ca85773813f8f8695728244e317c3afe Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:33:03 +0100
Subject: [PATCH 05/24] Fix

---
 manifest.toml   |  2 --
 scripts/install |  7 -------
 scripts/remove  |  1 -
 scripts/upgrade | 17 -----------------
 4 files changed, 27 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 12207a9..328b673 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,8 +19,6 @@ code = "https://codeberg.org/calckey/calckey"
 yunohost = ">= 11.0.0"
 architectures = "all" 
 multi_instance = false
-ldap = "false" 
-sso = "false" 
 disk = "50M" 
 ram.build = "50M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index d1a2e30..6ce21f3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -18,13 +18,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
-# FIND AND OPEN A PORT
-#=================================================
-ynh_script_progression --message="Finding an available port..." --weight=1
-
-# Find an available port
-port=$(ynh_find_port --port=3020)
-ynh_app_setting_set --app=$app --key=port --value=$port
 
 #=================================================
 # INSTALL DEPENDENCIES
diff --git a/scripts/remove b/scripts/remove
index 374019a..45b7ec2 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -69,7 +69,6 @@ ynh_script_progression --message="Removing dependencies..." --weight=1
 
 # Remove metapackage and its dependencies
 ynh_remove_nodejs
-ynh_remove_app_dependencies
 
 #=================================================
 # SPECIFIC REMOVE
diff --git a/scripts/upgrade b/scripts/upgrade
index 0e9934e..03807d1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -39,16 +39,6 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line
 #=================================================
 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 () {
-	ynh_clean_check_starting
-	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -146,13 +136,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="All workers started"
 
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # SECURE FILES AND DIRECTORIES
 #=================================================

From 792e58301ba1fea6ee7dab743b7b12b05ecaf140 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:34:47 +0100
Subject: [PATCH 06/24] Fix

---
 test.toml | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 test.toml

diff --git a/test.toml b/test.toml
deleted file mode 100644
index 0ef210b..0000000
--- a/test.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-test_format = 1.0
-
-[default]
-
-    # ------------
-    # Tests to run
-    # ------------
-
-    exclude ="install.nourl"
-
-    # -------------------------------
-    # Default args to use for install
-    # -------------------------------
-
-    # -------------------------------
-    # Commits to test upgrade from
-    # -------------------------------
-
-    test_upgrade_from.89f4f52.name = "Upgrade from 13.0.5"
\ No newline at end of file

From 8c4bf0ab7a8d23c7a2b903ba92a1077c4733839f Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:35:07 +0100
Subject: [PATCH 07/24] Rename tests.toml

---
 tests.toml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 tests.toml

diff --git a/tests.toml b/tests.toml
new file mode 100644
index 0000000..0ef210b
--- /dev/null
+++ b/tests.toml
@@ -0,0 +1,19 @@
+test_format = 1.0
+
+[default]
+
+    # ------------
+    # Tests to run
+    # ------------
+
+    exclude ="install.nourl"
+
+    # -------------------------------
+    # Default args to use for install
+    # -------------------------------
+
+    # -------------------------------
+    # Commits to test upgrade from
+    # -------------------------------
+
+    test_upgrade_from.89f4f52.name = "Upgrade from 13.0.5"
\ No newline at end of file

From dec7e9ceb7e8b1913300f959665163aa2ab476ce Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:40:27 +0100
Subject: [PATCH 08/24] Fix

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

diff --git a/manifest.toml b/manifest.toml
index 328b673..12207a9 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,6 +19,8 @@ code = "https://codeberg.org/calckey/calckey"
 yunohost = ">= 11.0.0"
 architectures = "all" 
 multi_instance = false
+ldap = "false" 
+sso = "false" 
 disk = "50M" 
 ram.build = "50M"
 ram.runtime = "50M"

From 7d87e6d9e063f7898a695d0d05edfcf7a35c4c9d Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:46:23 +0100
Subject: [PATCH 09/24] Fix

---
 manifest.toml   |  4 ++--
 scripts/install |  3 ---
 scripts/remove  | 14 --------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 12207a9..d3bc8e1 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,8 +19,8 @@ code = "https://codeberg.org/calckey/calckey"
 yunohost = ">= 11.0.0"
 architectures = "all" 
 multi_instance = false
-ldap = "false" 
-sso = "false" 
+ldap = "not_relevant" 
+sso = "not_relevant" 
 disk = "50M" 
 ram.build = "50M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index 6ce21f3..e4bf2fe 100644
--- a/scripts/install
+++ b/scripts/install
@@ -26,9 +26,6 @@ ynh_script_progression --message="Installing dependencies... This might take som
 
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 45b7ec2..1164548 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -39,14 +39,6 @@ ynh_script_progression --message="Removing logrotate configuration..." --weight=
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-#=================================================
-# REMOVE THE POSTGRESQL DATABASE
-#=================================================
-ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1
-
-# Remove a database if it exists, along with the associated user
-ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
-
 #=================================================
 # REMOVE THE REDIS DATABASE
 #=================================================
@@ -82,12 +74,6 @@ ynh_secure_remove --file="/var/log/$app"
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
-# REMOVE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --weight=1
-
-# Delete a system user
-ynh_system_user_delete --username=$app
 
 #=================================================
 # END OF SCRIPT

From e9fe4c6b6df12b86e431d8c128cee47ad9636a60 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:50:33 +0100
Subject: [PATCH 10/24] Fix

---
 scripts/restore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/restore b/scripts/restore
index 4581a6f..e8ef107 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -30,7 +30,6 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=5
 
 # Define and install dependencies
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # REINSTALL PNPM

From 0baad0143deace220a611849b6b844cdb23614b8 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:55:00 +0100
Subject: [PATCH 11/24] Fix

---
 scripts/upgrade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 03807d1..7f4c556 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -76,7 +76,6 @@ fi
 ynh_script_progression --message="Upgrading dependencies..." --weight=5
 
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 # REMOVE YARN (upgrade from 13.0.x to 13.1.x)
 ynh_script_progression --message="Removing old version dependency..."

From 9f8d25c9c7a6c3320cb1264d9a76447cf1dfc72a Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Wed, 15 Feb 2023 02:21:00 +0100
Subject: [PATCH 12/24] Fix

---
 tests.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests.toml b/tests.toml
index 0ef210b..fae6662 100644
--- a/tests.toml
+++ b/tests.toml
@@ -6,8 +6,6 @@ test_format = 1.0
     # Tests to run
     # ------------
 
-    exclude ="install.nourl"
-
     # -------------------------------
     # Default args to use for install
     # -------------------------------

From 02bb1878a8b4785048cf977bfe573e5e71c7f6df Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Fri, 17 Feb 2023 06:31:08 +0100
Subject: [PATCH 13/24] Fix

---
 scripts/install | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/install b/scripts/install
index e4bf2fe..4973de6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -34,12 +34,6 @@ ynh_script_progression --message="Setting up source files..." --weight=3
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
@@ -61,6 +55,12 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
 
 ynh_add_config --template="../conf/default.yml" --destination="$install_dir/.config/default.yml"
 
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
+chmod 400 "$install_dir/.config/default.yml"
+chown $app:$app "$install_dir/.config/default.yml"
+
 #=================================================
 # BUILD APP
 #=================================================

From 268e778fea1f2e8592dfad61911877b672eafc5a Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Fri, 17 Feb 2023 06:59:01 +0100
Subject: [PATCH 14/24] Fix nodejs_version

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index ffeb039..9af0f1e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 # PHP APP SPECIFIC
 #=================================================
 
-NODEJS_VERSION="19"
+NODEJS_VERSION="18.14.1"
 
 # dependencies used by the app
 pkg_dependencies="ffmpeg postgresql build-essential"

From 96286b89c49aa78f6d22d00e97d50ae2780fba31 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Fri, 17 Feb 2023 07:11:06 +0100
Subject: [PATCH 15/24] Fix

---
 scripts/_common.sh | 2 +-
 scripts/install    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 9af0f1e..ffeb039 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 # PHP APP SPECIFIC
 #=================================================
 
-NODEJS_VERSION="18.14.1"
+NODEJS_VERSION="19"
 
 # dependencies used by the app
 pkg_dependencies="ffmpeg postgresql build-essential"
diff --git a/scripts/install b/scripts/install
index 4973de6..e3ffc7c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -70,7 +70,7 @@ pushd "$install_dir"
 	ynh_use_nodejs
 	corepack enable
 	corepack prepare pnpm@latest --activate
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --unsafe-perm
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init
 popd

From 260696f0c988d79d5755a55c81d142f21d7228e3 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Fri, 17 Feb 2023 13:53:53 +0100
Subject: [PATCH 16/24] Fix

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index e3ffc7c..bef57f6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -70,7 +70,7 @@ pushd "$install_dir"
 	ynh_use_nodejs
 	corepack enable
 	corepack prepare pnpm@latest --activate
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --unsafe-perm
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install  --unsafe-perm=true --allow-root
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init
 popd

From 9b64d1efe3c890938b2d867a50f318bdd8fb75ea Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Fri, 17 Feb 2023 14:01:36 +0100
Subject: [PATCH 17/24] Fix

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

diff --git a/scripts/install b/scripts/install
index bef57f6..6be975a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -70,9 +70,9 @@ pushd "$install_dir"
 	ynh_use_nodejs
 	corepack enable
 	corepack prepare pnpm@latest --activate
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install  --unsafe-perm=true --allow-root
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm install
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run init
 popd
 
 #=================================================

From 1a2adad8ba43a22b922d0c09d8c70cb52a0afe8a Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Mon, 20 Feb 2023 01:58:47 +0100
Subject: [PATCH 18/24] Update systemd.service

---
 conf/systemd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 2b708ad..d1c030b 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=__FINALPATH__/
+WorkingDirectory=__INSTALLDIR__/
 Environment="__YNH_NODE_LOAD_PATH__"
 Environment="NODE_ENV=production"
 ExecStart=__YNH_NPM__ start

From c872ded25fc6afa0c497dabe7d860563c8fd71ea Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Mon, 20 Feb 2023 02:03:15 +0100
Subject: [PATCH 19/24] Update systemd.service

---
 conf/systemd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index d1c030b..9d771d3 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=__INSTALLDIR__/
+WorkingDirectory=__INSTALL_DIR__/
 Environment="__YNH_NODE_LOAD_PATH__"
 Environment="NODE_ENV=production"
 ExecStart=__YNH_NPM__ start

From 7f56595903862456305996caaf52b96e0f9c00d0 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Mon, 20 Feb 2023 10:43:10 +0100
Subject: [PATCH 20/24] Update restore

---
 scripts/restore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/restore b/scripts/restore
index e8ef107..0fea344 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -52,6 +52,13 @@ ynh_script_progression --message="Restoring the NGINX web server configuration..
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
+#=================================================
+# RESTORE THE POSTGRESQL DATABASE
+#=================================================
+ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1
+
+ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
+
 #=================================================
 # SECURE FILES AND DIRECTORIES
 #=================================================

From 56a8770a4c6abeedcba873405cc71e469e34bfc8 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Mon, 20 Feb 2023 13:10:05 +0100
Subject: [PATCH 21/24] Update upgrade

---
 scripts/upgrade | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 7f4c556..aca8f7e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -70,6 +70,10 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep=".config/default.yml"
 fi
 
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R $app:www-data "$install_dir"
+
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@@ -135,13 +139,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="All workers started"
 
-#=================================================
-# 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 84ae1d962d8f4d0358c130f148c544657e1b1fe5 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Mon, 20 Feb 2023 14:38:12 +0100
Subject: [PATCH 22/24] Update tests.toml

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

diff --git a/tests.toml b/tests.toml
index fae6662..71e7a74 100644
--- a/tests.toml
+++ b/tests.toml
@@ -9,9 +9,9 @@ test_format = 1.0
     # -------------------------------
     # Default args to use for install
     # -------------------------------
-
+      exclude = ["change_url"]
     # -------------------------------
     # Commits to test upgrade from
     # -------------------------------
 
-    test_upgrade_from.89f4f52.name = "Upgrade from 13.0.5"
\ No newline at end of file
+    test_upgrade_from.89f4f52.name = "Upgrade from 13.0.5"

From ce75bc176030d06a36aa054f122018b13037e16a Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Mon, 20 Feb 2023 22:46:46 +0000
Subject: [PATCH 23/24] Auto-update README

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

diff --git a/README.md b/README.md
index 6916fcf..36d225c 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ It shall NOT be edited by hand.
 # Calckey for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![Working status](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
+
 [![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -32,30 +33,6 @@ A greatly enhanced fork of Misskey with better UI/UX, security, features, and mo
 
 ![Screenshot of Calckey](./doc/screenshots/screenshot-calckey.png)
 
-## Disclaimers / important information
-
-### Important points to read before installing
-
-- *Calckey* requires a dedicated root domain, e.g. `Calckey.domain.tld`
-- Due to Cypress dependency, *Calckey* only works on 64-bit CPU machines.
-- *Calckey* can take quite some time to install (more then 30 minutes). So take out some time and grab yourself a coffee.
-- If installing from command line, using `screen` is recommended to avoid disconnection. See below.
-- After installation, first page can take time to load and may show timeout error. Give it time to make itself ready for you. Refresh the page after 2 or 3 minutes.
-- The first account created will be an admin user and will have all the admin rights.
-
-Using screen in case of disconnects
-
-``` 
-sudo apt-get install screen
-screen
-sudo yunohost app install https://github.com/YunoHost-Apps/Calckey_ynh.git
-```
-Recover after disconnect:
-```
-screen -d
-screen -r
-```
-
 ## Documentation and resources
 
 * Official app website: <https://i.calckey.cloud/>
diff --git a/README_fr.md b/README_fr.md
index e491ddc..3561cae 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -6,6 +6,7 @@ It shall NOT be edited by hand.
 # Calckey pour YunoHost
 
 [![Niveau d’intégration](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
+
 [![Installer Calckey avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
 
 *[Read this readme in english.](./README.md)*
@@ -30,30 +31,6 @@ Un fork grandement amélioré de Misskey avec une meilleure UI/UX, sécurité, f
 
 ![Capture d’écran de Calckey](./doc/screenshots/screenshot-calckey.png)
 
-## Avertissements / informations importantes
-
-### Points importants à lire avant l'installation
-
-- *Calckey* nécessite un domaine racine dédié, par ex. `Calckey.domain.tld`
-- En raison de la dépendance de Cypress, *Calckey* ne fonctionne que sur les machines à processeur 64 bits.
-- *Calckey* peut prendre un certain temps à installer (plus de 30 minutes). Alors prenez un peu de temps et prenez un café.
-- Si l'installation à partir de la ligne de commande, l'utilisation de l'écran est réenregistrée pour éviter la déconnexion. Voir ci-dessous.
-- Après l'installation, la première page peut prendre du temps à charger et peut afficher une erreur de délai d'attente. Donnez-lui le temps de se préparer pour vous. Actualiser la page après 2-3 minutes.
-- Le premier compte créé sera un utilisateur administrateur et disposera de tous les droits d'administrateur.
-
-Utiliser *screen* en cas de déconnexion
-
-``` 
-sudo apt-get install screen
-screen
-sudo yunohost app install https://github.com/YunoHost-Apps/Calckey_ynh.git
-```
-Récupérer après déconnexion :
-```
-screen -d
-screen -r
-```
-
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://i.calckey.cloud/>

From 3d40f65244d537b78be003c1c4d3cc9310b8df25 Mon Sep 17 00:00:00 2001
From: tituspijean <titus@pijean.ovh>
Date: Fri, 24 Feb 2023 18:19:14 +0100
Subject: [PATCH 24/24] [autopatch] Upgrade auto-updater

---
 .github/workflows/updater.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
index 4363d38..4a866ff 100644
--- a/.github/workflows/updater.yml
+++ b/.github/workflows/updater.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run the updater script
@@ -33,7 +33,7 @@ jobs:
       - name: Create Pull Request
         id: cpr
         if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update to version ${{ env.VERSION }}