From 82756153651cdb72f29ab898efcc3e8d0fb7f634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 4 Nov 2021 20:15:49 +0100
Subject: [PATCH] Add rights (#90)

---
 README.md                   |  57 +++++++++++------------
 README_fr.md                |  49 +++++++++-----------
 conf/config.local.php       |   2 +-
 doc/DESCRIPTION.md          |   1 +
 doc/DESCRIPTION_fr.md       |   1 +
 doc/DISCLAIMER.md           |   9 ++++
 doc/DISCLAIMER_fr.md        |   9 ++++
 doc/screenshots/TPjh48P.png | Bin 0 -> 18507 bytes
 manifest.json               |  21 +++++----
 scripts/backup              |   3 +-
 scripts/install             |  59 ++++++++++++-----------
 scripts/remove              |   7 +--
 scripts/restore             |  60 ++++++++++++------------
 scripts/upgrade             |  90 +++++++++++++++---------------------
 14 files changed, 187 insertions(+), 181 deletions(-)
 create mode 100644 doc/DESCRIPTION.md
 create mode 100644 doc/DESCRIPTION_fr.md
 create mode 100644 doc/DISCLAIMER.md
 create mode 100644 doc/DISCLAIMER_fr.md
 create mode 100644 doc/screenshots/TPjh48P.png

diff --git a/README.md b/README.md
index d4e22b3..f93a843 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Jirafeau for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/jirafeau.svg)](https://dash.yunohost.org/appci/app/jirafeau) ![](https://ci-apps.yunohost.org/ci/badges/jirafeau.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/jirafeau.maintain.svg)  
@@ -5,53 +10,43 @@
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allow you to install Jirafeau quickly and simply on a YunoHost server.  
-If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+> *This package allows you to install Jirafeau quickly and simply on a YunoHost server.
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
 
-Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it.
+Jirafeau offers the possibility to host and share your files with ease. Choose a file, Jirafeau will provide you with a link with many options. It is possible to protect your links with a password as well as to choose how long the file will be kept on the server. The file and the link will self-destruct after this time. Downloads of transmitted files can be limited to a certain date, and each file can self-destruct after the first download. Jirafeau allows you to configure maximum retention times and maximum size per file. Encryption is available as an option.
 
-**Shipped version:** 4.3.0
+
+**Shipped version:** 4.3.0~ynh2
+
+**Demo:** https://demo.yunohost.org/jirafeau/
 
 ## Screenshots
 
-![](http://i.imgur.com/TPjh48P.png)
+![](./doc/screenshots/TPjh48P.png)
 
-## Demo
-
-* [YunoHost demo](https://demo.yunohost.org/jirafeau/)
+## Disclaimers / important information
 
 ## Configuration
 
-## Documentation
+### Changing the conditions of use of the service
 
- * Official documentation: 
- * YunoHost documentation: https://yunohost.org/en/app_jirafeau
+The license text on the "Terms of Service" page, which is shipped with the default installation, is "based on the Open Source Initiative Terms of Service". To change this text simply copy the file `/lib/tos.original.txt`, rename it to `/lib/tos.local.txt` and adapt it to your own needs. If you update the installation, then only the `tos.original.txt` file may change eventually, not your `tos.local.txt file`.
 
-## YunoHost specific features
+## Administration
 
-#### Supported architectures
+To administer the files within Jirafeau it is enough to go to the address `jirafeau.domaine.tld/admin.php`.
+## Documentation and resources
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/jirafeau.svg)](https://ci-apps.yunohost.org/ci/apps/jirafeau/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/jirafeau.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jirafeau/)
+* Official app website: https://gitlab.com/mojo42/Jirafeau
+* Upstream app code repository: https://gitlab.com/mojo42/Jirafeau
+* YunoHost documentation for this app: https://yunohost.org/app_jirafeau
+* Report a bug: https://github.com/YunoHost-Apps/jirafeau_ynh/issues
 
-## Limitations
+## Developer info
 
-## Additional information
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/jirafeau_ynh/issues
- * Jirafeau website: https://gitlab.com/mojo42/Jirafeau
- * Upstream app repository: https://gitlab.com/mojo42/Jirafeau
- * YunoHost website: https://yunohost.org/
-
----
-
-## Developers info
-
-Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/jirafeau_ynh/tree/testing).
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/jirafeau_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
 ```
@@ -59,3 +54,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/jirafeau_ynh/tree/tes
 or
 sudo yunohost app upgrade jirafeau -u https://github.com/YunoHost-Apps/jirafeau_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
diff --git a/README_fr.md b/README_fr.md
index 5c7d08b..6788b55 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -3,51 +3,42 @@
 [![Niveau d'intégration](https://dash.yunohost.org/integration/jirafeau.svg)](https://dash.yunohost.org/appci/app/jirafeau) ![](https://ci-apps.yunohost.org/ci/badges/jirafeau.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/jirafeau.maintain.svg)  
 [![Installer Jirafeau avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jirafeau)
 
-*[Read this readme in english.](./README.md)* 
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
 
-> *Ce package vous permet d'installer Jirafeau rapidement et simplement sur un serveur YunoHost.  
+> *Ce package vous permet d'installer Jirafeau 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
 
-Jirafeau est un site web permettant d'héberger et de partager des fichiers de manière simple en leur donnant un lien unique.
+Jirafeau offre la possibilité d'héberger et de partager vos fichiers, le tout en toute simplicité. Choisissez un fichier, Jirafeau vous fournira un lien avec beaucoup d'options. Il est possible de protéger vos liens avec mot de passe ainsi que de choisir la durée de rétention du fichier sur le serveur. Le fichier et le lien s'autodétruiront passé ce délai. Les téléchargements des fichiers transmis peuvent être limités à une certaine date, et chaque fichier peut s'autodétruire après le premier téléchargement. Jirafeau permet de configurer les temps maximum de rétention ainsi que la taille maximale par fichier. Le chiffrement est disponible en option.
 
-**Version incluse :** 4.3.0
+
+**Version incluse :** 4.3.0~ynh2
+
+**Démo :** https://demo.yunohost.org/jirafeau/
 
 ## Captures d'écran
 
-![](http://i.imgur.com/TPjh48P.png)
+![](./doc/screenshots/TPjh48P.png)
 
-## Démo
-
-* [Démo officielle](https://demo.yunohost.org/jirafeau/)
+## Avertissements / informations importantes
 
 ## Configuration
 
-## Documentation
+### Changer les conditions d'utilisation du service
 
- * Documentation officielle : 
- * Documentation YunoHost : https://yunohost.org/fr/app_jirafeau
+Le texte de la licence sur la page "Conditions d'utilisation du service", qui est livrée avec l'installation par défaut, est basé sur les "Conditions d'utilisation du service de l'Initiative Open Source". Pour modifier ce texte, il suffit de copier le fichier `/lib/tos.original.txt`, de le renommer en `/lib/tos.local.txt` et de l'adapter à vos propres besoins. Si vous mettez à jour l'installation, alors seul le fichier `tos.original.txt` peut changer éventuellement, et non votre fichier `tos.local.txt`.
 
-## Caractéristiques spécifiques YunoHost
+## Administration
 
-#### Architectures supportées
+Pour administrer les fichiers présents au sein de Jirafeau il suffit de se rendre à l'adresse `jirafeau.domaine.tld/admin.php`.
+## Documentations et ressources
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/jirafeau.svg)](https://ci-apps.yunohost.org/ci/apps/jirafeau/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/jirafeau.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jirafeau/)
-
-## Limitations
-
-## Informations additionnelles
-
-## Liens
-
- * Signaler un bug : https://github.com/YunoHost-Apps/jirafeau_ynh/issues
- * Site de l'application : https://gitlab.com/mojo42/Jirafeau
- * Dépôt de l'application principale : https://gitlab.com/mojo42/Jirafeau
- * Site web YunoHost : https://yunohost.org/
-
----
+* Site officiel de l'app : https://gitlab.com/mojo42/Jirafeau
+* Dépôt de code officiel de l'app : https://gitlab.com/mojo42/Jirafeau
+* Documentation YunoHost pour cette app : https://yunohost.org/app_jirafeau
+* Signaler un bug : https://github.com/YunoHost-Apps/jirafeau_ynh/issues
 
 ## Informations pour les développeurs
 
@@ -59,3 +50,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/jirafeau_ynh/tree/tes
 ou
 sudo yunohost app upgrade jirafeau -u https://github.com/YunoHost-Apps/jirafeau_ynh/tree/testing --debug
 ```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file
diff --git a/conf/config.local.php b/conf/config.local.php
index fd209dd..80ba5c6 100644
--- a/conf/config.local.php
+++ b/conf/config.local.php
@@ -31,7 +31,7 @@ $cfg['web_root'] = 'https://' . '__DOMAIN__' . '__PATH__' . '/';
 
 /* Path to data directory, with trailing slash (eg. »/var/www/data/var_314159265358979323846264«
  */
-$cfg['var_root'] = '__VAR_ROOT__' . '/';
+$cfg['var_root'] = '__DATADIR__' . '/';
 
 /* Language - choice between 'auto' or any language located in the /lib/locales/ folder.
  * The mode »auto« will cause the script to detect the user's browser information
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
new file mode 100644
index 0000000..6a49aff
--- /dev/null
+++ b/doc/DESCRIPTION.md
@@ -0,0 +1 @@
+Jirafeau offers the possibility to host and share your files with ease. Choose a file, Jirafeau will provide you with a link with many options. It is possible to protect your links with a password as well as to choose how long the file will be kept on the server. The file and the link will self-destruct after this time. Downloads of transmitted files can be limited to a certain date, and each file can self-destruct after the first download. Jirafeau allows you to configure maximum retention times and maximum size per file. Encryption is available as an option.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..b3f5a7b
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1 @@
+Jirafeau offre la possibilité d'héberger et de partager vos fichiers, le tout en toute simplicité. Choisissez un fichier, Jirafeau vous fournira un lien avec beaucoup d'options. Il est possible de protéger vos liens avec mot de passe ainsi que de choisir la durée de rétention du fichier sur le serveur. Le fichier et le lien s'autodétruiront passé ce délai. Les téléchargements des fichiers transmis peuvent être limités à une certaine date, et chaque fichier peut s'autodétruire après le premier téléchargement. Jirafeau permet de configurer les temps maximum de rétention ainsi que la taille maximale par fichier. Le chiffrement est disponible en option.
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
new file mode 100644
index 0000000..e2c3b48
--- /dev/null
+++ b/doc/DISCLAIMER.md
@@ -0,0 +1,9 @@
+## Configuration
+
+### Changing the conditions of use of the service
+
+The license text on the "Terms of Service" page, which is shipped with the default installation, is "based on the Open Source Initiative Terms of Service". To change this text simply copy the file `/lib/tos.original.txt`, rename it to `/lib/tos.local.txt` and adapt it to your own needs. If you update the installation, then only the `tos.original.txt` file may change eventually, not your `tos.local.txt file`.
+
+## Administration
+
+To administer the files within Jirafeau it is enough to go to the address `jirafeau.domaine.tld/admin.php`.
\ No newline at end of file
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
new file mode 100644
index 0000000..1e3e5db
--- /dev/null
+++ b/doc/DISCLAIMER_fr.md
@@ -0,0 +1,9 @@
+## Configuration
+
+### Changer les conditions d'utilisation du service
+
+Le texte de la licence sur la page "Conditions d'utilisation du service", qui est livrée avec l'installation par défaut, est basé sur les "Conditions d'utilisation du service de l'Initiative Open Source". Pour modifier ce texte, il suffit de copier le fichier `/lib/tos.original.txt`, de le renommer en `/lib/tos.local.txt` et de l'adapter à vos propres besoins. Si vous mettez à jour l'installation, alors seul le fichier `tos.original.txt` peut changer éventuellement, et non votre fichier `tos.local.txt`.
+
+## Administration
+
+Pour administrer les fichiers présents au sein de Jirafeau il suffit de se rendre à l'adresse `jirafeau.domaine.tld/admin.php`.
\ No newline at end of file
diff --git a/doc/screenshots/TPjh48P.png b/doc/screenshots/TPjh48P.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c7605da74bb2095d65e65a6972d22795e564b53
GIT binary patch
literal 18507
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

literal 0
HcmV?d00001

diff --git a/manifest.json b/manifest.json
index b736cd7..65d47dd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,13 +8,19 @@
 	},
 	"version": "4.3.0~ynh2",
 	"url": "https://gitlab.com/mojo42/Jirafeau",
+	"upstream": {
+        "license": "AGPL-3.0-only",
+        "website": "https://gitlab.com/mojo42/Jirafeau",
+        "demo": "https://demo.yunohost.org/jirafeau/",
+        "code": "https://gitlab.com/mojo42/Jirafeau"
+    },
 	"license": "AGPL-3.0-only",
 	"maintainer": {
 		"name": "julien",
 		"email": "julien.malik@paraiso.me"
 	},
 	"requirements": {
-		"yunohost": ">= 4.1.7"
+		"yunohost": ">= 4.2.4"
 	},
 	"multi_instance": false,
 	"services": [
@@ -25,8 +31,7 @@
 		"install" : [
 			{
 				"name": "domain",
-				"type": "domain",
-				"example": "domain.org"
+				"type": "domain"
 			},
 			{
 				"name": "path",
@@ -40,18 +45,16 @@
 				"ask": {
 					"en": "Choose an admin user (will be able to access admin.php page)",
 					"fr": "Choisissez l'administrateur (seul autorisé à accéder à la page admin.php)"
-				},
-				"example": "johndoe"
+				}
 			},
 			{
 				"name": "upload_password",
 				"type": "password",
 				"optional": true,
 				"ask": {
-					"en": "Set the password granting upload permissions (leave empty to allow anybody to upload)",
-					"fr": "Définissez le mot de passe permettant l'accès à l'envoi de fichiers (laissez vide pour autoriser tout le monde)"
-				},
-				"example": "supersecretpassword"
+					"en": "Set the password granting upload permissions (leave empty to allow anybody to upload). Please avoid using ' (quotes) in the password as it will fail the app...",
+					"fr": "Définissez le mot de passe permettant l'accès à l'envoi de fichiers (laissez vide pour autoriser tout le monde). Veuillez éviter d'utiliser ' (guillemets) dans le mot de passe car cela fera échouer l'application..."
+				}
 			},
 			{
 				"name": "is_public",
diff --git a/scripts/backup b/scripts/backup
index b4e5a99..91246d8 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -24,6 +24,7 @@ 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)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -40,7 +41,7 @@ ynh_backup --src_path="$final_path"
 # BACKUP OF THE DATA DIR
 #=================================================
 
-ynh_backup --src_path="/home/yunohost.app/$app" --is_big
+ynh_backup --src_path="$datadir" --is_big
 
 #=================================================
 # BACKUP OF THE NGINX CONFIGURATION
diff --git a/scripts/install b/scripts/install
index cec41ff..9891e2e 100755
--- a/scripts/install
+++ b/scripts/install
@@ -23,9 +23,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 admin_user=$YNH_APP_ARG_ADMIN_USER
-ynh_print_OFF
 upload_password=$YNH_APP_ARG_UPLOAD_PASSWORD
-ynh_print_ON
 is_public=$YNH_APP_ARG_IS_PUBLIC
 
 app=$YNH_APP_INSTANCE_NAME
@@ -51,6 +49,14 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin_user
 ynh_app_setting_set --app=$app --key=is_public --value=$is_public
 
+#=================================================
+# 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"
+
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -62,6 +68,10 @@ 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"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -70,14 +80,6 @@ ynh_script_progression --message="Configuring NGINX web server..."
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=2
-
-# Create a system user
-ynh_system_user_create --username=$app
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -97,7 +99,6 @@ jirafeauconfigfile="$final_path/lib/config.local.php"
 cp "../conf/config.local.php" "$jirafeauconfigfile"
 
 # Set and save upload password, allowing an empty one
-ynh_print_OFF
 if [ -z "$upload_password" ]
 then
 	ynh_replace_string --match_string="__UPLOAD_PASSWORD__" --replace_string="" --target_file="$jirafeauconfigfile"
@@ -106,15 +107,26 @@ else
 	ynh_replace_special_string --match_string="__UPLOAD_PASSWORD__" --replace_string="'$upload_password'" --target_file="$jirafeauconfigfile"
 	ynh_app_setting_set --app=$app --key=upload_password --value="$upload_password"
 fi
-ynh_print_ON
+
+#=================================================
+# CREATE DATA DIRECTORY
+#=================================================
+ynh_script_progression --message="Creating a data directory..." --weight=1
+
+datadir=/home/yunohost.app/$app
+ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+
+mkdir -p $datadir/{files,links,async,block}
+
+chmod 750 "$datadir"
+chmod -R o-rwx "$datadir"
+chown -R $app:www-data "$datadir"
 
 #=================================================
 # CONFIGURE JIRAFEAU
 #=================================================
 ynh_script_progression --message="Configuring Jirafeau..." --weight=2
 
-var_root=/home/yunohost.app/$app
-
 ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$jirafeauconfigfile"
 if [ "$path_url" = "/" ]
 then
@@ -122,7 +134,7 @@ then
 else
 	ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$jirafeauconfigfile"
 fi
-ynh_replace_string --match_string="__VAR_ROOT__" --replace_string="$var_root" --target_file="$jirafeauconfigfile"
+ynh_replace_string --match_string="__DATADIR__" --replace_string="$datadir" --target_file="$jirafeauconfigfile"
 ynh_replace_string --match_string="__ADMIN_USER__" --replace_string="$admin_user" --target_file="$jirafeauconfigfile"
 
 # Calculate and store the config file checksum into the app settings
@@ -131,24 +143,17 @@ ynh_store_file_checksum --file="$jirafeauconfigfile"
 # Remove the install.php
 ynh_secure_remove --file=$final_path/install.php
 
+chmod 400 "$jirafeauconfigfile"
+chown $app:$app "$jirafeauconfigfile"
+
 #=================================================
 # SET THE CRON FILE
 #=================================================
 ynh_script_progression --message="Configuring the cron file..." --weight=2
 
 ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
-
-#=================================================
-# GENERIC FINALISATION
-#=================================================
-# SECURING FILES AND DIRECTORIES
-#=================================================
-
-chown -R root: $final_path
-
-mkdir -p $var_root/{files,links,async,block}
-chown -R $app:root $var_root
-chmod -R 700 $var_root
+chown root: "/etc/cron.d/$app"
+chmod 644 "/etc/cron.d/$app"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/remove b/scripts/remove
index 9e6c2bc..1e7f07f 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -18,13 +18,14 @@ 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)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # STANDARD REMOVE
 #=================================================
 # REMOVE THE MAIN DIR OF THE APP
 #=================================================
-ynh_script_progression --message="Removing Jirafeau main directory..." --weight=2
+ynh_script_progression --message="Removing app main directory..." --weight=2
 
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
@@ -59,7 +60,7 @@ ynh_secure_remove --file="/etc/cron.d/$app"
 #=================================================
 ynh_script_progression --message="Removing data directory..." --weight=1
 
-ynh_secure_remove --file="/home/yunohost.app/$app"
+ynh_secure_remove --file="$datadir"
 
 #=================================================
 # GENERIC FINALISATION
@@ -75,4 +76,4 @@ ynh_system_user_delete --username=$app
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of Jirafeau completed" --last
+ynh_script_progression --message="Removal of $app completed" --last
diff --git a/scripts/restore b/scripts/restore
index e65b939..9c38fa6 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -26,6 +26,7 @@ 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)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
@@ -40,27 +41,46 @@ test ! -d $final_path \
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
+ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# RESTORE THE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Restoring Jirafeau main directory..." --weight=2
-
-ynh_restore_file --origin_path="$final_path"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
 ynh_script_progression --message="Recreating the dedicated system user..." --weight=2
 
 # Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
+#=================================================
+# RESTORE THE APP MAIN DIR
+#=================================================
+ynh_script_progression --message="Restoring $app main directory..." --weight=2
+
+ynh_restore_file --origin_path="$final_path"
+
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
+#=================================================
+# RESTORE THE DATA DIRECTORY
+#=================================================
+ynh_script_progression --message="Restoring the data directory..." --weight=1
+
+ynh_restore_file --origin_path="$datadir" --not_mandatory
+
+mkdir -p "$datadir/{files,links,async,block}"
+
+chmod 750 "$datadir"
+chmod -R o-rwx "$datadir"
+chown -R $app:www-data "$datadir"
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
+ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
@@ -72,26 +92,8 @@ ynh_add_fpm_config
 ynh_script_progression --message="Restoring the cron file..." --weight=1
 
 ynh_restore_file --origin_path="/etc/cron.d/$app"
-
-#=================================================
-# SPECIFIC RESTORE
-#=================================================
-# RESTORE THE DATA OF JIRAFEAU
-#=================================================
-ynh_script_progression --message="Restoring the data directory..." --weight=2
-
-datadir="/home/yunohost.app/$app"
-
-# Use --not_mandatory for the data directory, because if the backup has been made with BACKUP_CORE_ONLY, there's no data into the backup.
-ynh_restore_file --origin_path="$datadir" --not_mandatory
-
-#=================================================
-# RESTORE USER RIGHTS
-#=================================================
-
-# Create app folders
-mkdir -p "$datadir"/{files,links,async,block}
-chown -R $app:root /home/yunohost.app/$app
+chown root: "/etc/cron.d/$app"
+chmod 644 "/etc/cron.d/$app"
 
 #=================================================
 # GENERIC FINALISATION
@@ -107,4 +109,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for Jirafeau" --last
+ynh_script_progression --message="Restoration completed for $app" --last
diff --git a/scripts/upgrade b/scripts/upgrade
index b80e9be..4fd4e8f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -21,10 +21,9 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin_user=$(ynh_app_setting_get --app=$app --key=admin)
 is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-ynh_print_OFF
 upload_password=$(ynh_app_setting_get --app=$app --key=upload_password)
-ynh_print_ON
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # CHECK VERSION
@@ -32,26 +31,37 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 upgrade_type=$(ynh_check_app_version_changed)
 
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up Jirafeau before upgrading (may take a while)..." --weight=3
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+    # restore it if the upgrade fails
+    ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
-# Fix is_public as a boolean value
-if [ "$is_public" = "Yes" ]; then
-	ynh_app_setting_set --app=$app --key=is_public --value=1
-	is_public=1
-elif [ "$is_public" = "No" ]; then
-	ynh_app_setting_set --app=$app --key=is_public --value=0
-	is_public=0
-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
 fi
 
+# If datadir doesn't exist, create it
+if [ -z "$datadir" ]; then
+    datadir=/home/yunohost.app/$app
+    ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+fi
+
 # Migrate files from 3.4.1 to 4.1.1
 current_version="$(ynh_app_upstream_version --manifest="/etc/yunohost/apps/$app/manifest.json")"
 update_version="$(ynh_app_upstream_version)"
@@ -60,8 +70,6 @@ if [ ${current_version:0:1} -le 3 ] && [ ${update_version:0:1} -ge 4 ]
 then
     ynh_script_progression --message="Migrating files..." --weight=5
 
-    var_root=/home/yunohost.app/$app
-
     # Migrate files and links to the new directory structure
     for type in files links
     do
@@ -78,7 +86,7 @@ then
 
                     # Split the file name every 8 characters
                     split=0
-                    full_path="$var_root/$type"
+                    full_path="$datadir/$type"
                     while [ $split -le ${#file} ]
                     do
                             part_dir="${file:$split:8}"
@@ -94,7 +102,7 @@ then
                     if [ "$type" = "files" ]; then
                             mv "${full_file}_count" "$full_path"
                     fi
-            done <<< "$(find "$var_root/$type" -type f)" # List all files, without directories
+            done <<< "$(find "$datadir/$type" -type f)" # List all files, without directories
     done
 
     # And clean the old directories
@@ -109,23 +117,17 @@ then
                     then
                             ynh_secure_remove --file="$file"
                     fi
-            done <<< "$(find "$var_root/$type" -maxdepth 1 -mindepth 1 -type d)" # List all first level directories
+            done <<< "$(find "$datadir/$type" -maxdepth 1 -mindepth 1 -type d)" # List all first level directories
     done
 fi
 
 #=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+# CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Backing up Jirafeau before upgrading (may take a while)..." --weight=3
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
 
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
 # STANDARD UPGRADE STEPS
@@ -141,6 +143,10 @@ then
 	ynh_setup_source --dest_dir="$final_path"
 fi
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -149,14 +155,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# 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
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -178,7 +176,6 @@ ynh_backup_if_checksum_is_different --file="$final_path/lib/config.local.php"
 cp "../conf/config.local.php" "$final_path/lib/config.local.php"
 
 # Set and save upload password, allowing an empty one
-ynh_print_OFF
 if [ -z "$upload_password" ]
 then
     ynh_replace_string --match_string="__UPLOAD_PASSWORD__" --replace_string="" --target_file="$jirafeauconfigfile"
@@ -187,14 +184,11 @@ else
     ynh_replace_special_string --match_string="__UPLOAD_PASSWORD__" --replace_string="'$upload_password'" --target_file="$jirafeauconfigfile"
 	ynh_app_setting_set --app=$app --key=upload_password --value="$upload_password"
 fi
-ynh_print_ON
 
 #=================================================
 # CONFIGURE JIRAFEAU
 #=================================================
-ynh_script_progression --message="Upgrading Jirafeau configuration..." --weight=2
-
-var_root=/home/yunohost.app/$app
+ynh_script_progression --message="Upgrading $app configuration..." --weight=2
 
 ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$jirafeauconfigfile"
 if [ "$path_url" = "/" ]
@@ -203,7 +197,7 @@ then
 else
 	ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$jirafeauconfigfile"
 fi
-ynh_replace_string --match_string="__VAR_ROOT__" --replace_string="$var_root" --target_file="$jirafeauconfigfile"
+ynh_replace_string --match_string="__DATADIR__" --replace_string="$datadir" --target_file="$jirafeauconfigfile"
 ynh_replace_string --match_string="__ADMIN_USER__" --replace_string="$admin_user" --target_file="$jirafeauconfigfile"
 
 # Recalculate and store the checksum of the file for the next upgrade.
@@ -218,18 +212,8 @@ ynh_secure_remove --file=$final_path/install.php
 ynh_script_progression --message="Configuring the cron file..." --weight=1
 
 ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
-
-#=================================================
-# GENERIC FINALISATION
-#=================================================
-# SECURING FILES AND DIRECTORIES
-#=================================================
-
-chown -R root: $final_path
-
-mkdir -p $var_root/{files,links,async,block}
-chown -R $app:root $var_root
-chmod -R 700 $var_root
+chown root: "/etc/cron.d/$app"
+chmod 644 "/etc/cron.d/$app"
 
 #=================================================
 # SETUP SSOWAT
@@ -256,4 +240,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of Jirafeau completed" --last
+ynh_script_progression --message="Upgrade of $app completed" --last