diff --git a/README.md b/README.md
index 0475fe4..e0d3834 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# Garradin
+# Garradin for Yunohost
 
-[![Integration level](https://dash.yunohost.org/integration/garradin.svg)](https://dash.yunohost.org/appci/app/garradin) ![](https://ci-apps.yunohost.org/ci/badges/garradin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/garradin.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/garradin.svg)](https://dash.yunohost.org/appci/app/garradin) ![](https://ci-apps.yunohost.org/ci/badges/garradin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/garradin.maintain.svg)
 [![Install Garradin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=garradin)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install Garradin quickly and simply on a YunoHost server.  
+> *This package allows you to install Garradin 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
@@ -27,7 +27,7 @@ Garradin is a free association managing software.
 
 
 ## Documentation
-
+  
  * Official documentation: https://fossil.kd2.org/garradin/wiki?name=Documentation
 
 ## YunoHost specific features
diff --git a/README_fr.md b/README_fr.md
index cc0254e..5376a12 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,11 +1,11 @@
-# Garradin
+# Garradin pour Yunohost
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/garradin.svg)](https://dash.yunohost.org/appci/app/garradin) ![](https://ci-apps.yunohost.org/ci/badges/garradin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/garradin.maintain.svg)  
 [![Installer Garradin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=garradin)
 
 *[Read this readme in english.](./README.md)* 
 
-> *Ce package vous permet d'installer REPLACEBYYOURAPP rapidement et simplement sur un serveur YunoHost.  
+> *Ce package vous permet d'installer Garradin rapidement et simplement sur un serveur YunoHost.  
 Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
 
 ## Vue d'ensemble
@@ -45,9 +45,6 @@ Garradin est un logiciel libre de gestion associative. il permet de gérer des m
 * Garradin n'est disponible qu'en français.
 * N'installez pas cette apllication à la racine du domaine par défaut sans ajouter un sous-domaine. Sinon la page de connexion SSO sera remplacée par la page d'accueil de Garradin.
 
-**Plus d'informations sur la page de documentation :**
-https://yunohost.org/packaging_apps
-
 ## Liens
 
  * Signaler un bug : https://github.com/YunoHost-Apps/garradin_ynh/issues
diff --git a/conf/nginx.conf b/conf/nginx.conf
index f8e5244..84bd542 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,12 +1,5 @@
 location __PATH__ {
 
-# Path to source
-alias __FINALPATH__/www/;
-
-if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   # Protecting sensibles urls
   location ~ 403 {
     rewrite ^(.*)$ /include/ redirect;
@@ -19,10 +12,17 @@ if ($scheme = http) {
     rewrite ^(.*)$ /config\.(.*)\.php redirect;
     }
 
+# Path to source
+alias __FINALPATH__/www/;
+
+if ($scheme = http) {
+    rewrite ^ https://$server_name$request_uri? permanent;
+  }
+
+
   # Example PHP configuration (remove if not used)
   index index.php /_route.php;
-  try_files $uri $uri/ index.php /_route.php;
-
+  try_files $uri $uri/ /_route.php;
 
   location ~ [^/]\.php(/|$) {
     try_files $uri $uri/ /_route.php;
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 3f4bc72..0626fd8 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -30,7 +30,7 @@ group = __USER__
 ;                            specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /var/run/php/php7.0-fpm-__NAMETOCHANGE__.sock
+listen = /var/run/php/php$YNH_PHP_VERSION-fpm-__NAMETOCHANGE__.sock
 
 ; Set listen(2) backlog. A value of '-1' means unlimited.
 ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
diff --git a/manifest.json b/manifest.json
index 147e7e8..372d3f3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "id": "garradin",
     "packaging_format": 1,
     "requirements": {
-        "yunohost": ">=3.7.0"
+        "yunohost": ">=3.7.1"
     },
     "description": {
         "en": "Software to manage association",
@@ -19,7 +19,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.0-fpm"
+        "php$YNH_PHP_VERSION-fpm"
     ],
     "arguments": {
         "install" : [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 768fbe1..9904210 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,10 +3,10 @@
 #=================================================
 # COMMON VARIABLES
 #=================================================
-
+echo $(php -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;") = "phpversion"
+YNH_PHP_VERSION="phpversion"
 # dependencies used by the app
-
-pkg_dependencies="php-sqlite3"
+pkg_dependencies="php$YNH_PHP_VERSION-sqlite3"
 
 # ============= FUTURE YUNOHOST HELPER =============
 
@@ -22,25 +22,31 @@ pkg_dependencies="php-sqlite3"
 # example: ynh_permission_has_user --permission=main --user=visitors
 #
 # Requires YunoHost version 3.7.1 or higher.
-ynh_permission_has_user() {
-    local legacy_args=pu
-    # Declare an array to define the options of this helper.
-    declare -Ar args_array=( [p]=permission= [u]=user= )
-    local permission
-    local user
-    # Manage arguments with getopts
-    ynh_handle_getopts_args "$@"
+# ynh_permission_has_user() {
+#     local legacy_args=pu
+#     # Declare an array to define the options of this helper.
+#     declare -Ar args_array=( [p]=permission= [u]=user= )
+#     local permission
+#     local user
+#     # Manage arguments with getopts
+#     ynh_handle_getopts_args "$@"
 
-    if ! ynh_permission_exists --permission=$permission
-    then
-        return 1
-    fi
+#     if ! ynh_permission_exists --permission=$permission
+#     then
+#         return 1
+#     fi
+#=================================================
+# EXPERIMENTAL HELPERS
+#=================================================
 
-    # List all permissions
-    # Filter only the required permission with a multiline sed (Here a cut from the permission to the next one), remove the url and his value
-    perm="$(yunohost user permission list --full --output-as plain | sed --quiet "/^#$app.$permission/,/^#[[:alnum:]]/p" | sed "/^##url/,+1d")"
-    # Remove all lines starting by # (got from the plain output before)
-    allowed_users="$(echo "$perm" | grep --invert-match '^#')"
-    # Grep the list of users an return the result if the user is indeed into the list
-    echo "$allowed_users" | grep --quiet --word "$user"
-}
+#     # List all permissions
+#     # Filter only the required permission with a multiline sed (Here a cut from the permission to the next one), remove the url and his value
+#     perm="$(yunohost user permission list --full --output-as plain | sed --quiet "/^#$app.$permission/,/^#[[:alnum:]]/p" | sed "/^##url/,+1d")"
+#     # Remove all lines starting by # (got from the plain output before)
+#     allowed_users="$(echo "$perm" | grep --invert-match '^#')"
+#     # Grep the list of users an return the result if the user is indeed into the list
+#     echo "$allowed_users" | grep --quiet --word "$user"
+# }
+#=================================================
+# FUTURE OFFICIAL HELPERS
+#=================================================
\ No newline at end of file
diff --git a/scripts/backup b/scripts/backup
index 27102aa..67b04de 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -20,7 +20,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -32,23 +32,23 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Backing up the main app directory..." --time --weight=1
+ynh_script_progression --message="Backing up the main app directory..."
 
 ynh_backup --src_path="$final_path"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Backing up nginx web server configuration..." --time --weight=1
+ynh_script_progression --message="Backing up nginx web server configuration..."
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Backing up php-fpm configuration..." --time --weight=1
+ynh_script_progression --message="Backing up php-fpm configuration..."
 
-ynh_backup --src_path="/etc/php/7.0/fpm/pool.d/$app.conf"
+ynh_backup --src_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/change_url b/scripts/change_url
index d112cdc..353d613 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..."
 
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
@@ -50,7 +50,7 @@ fi
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating nginx web server configuration..." --time --weight=1
+ynh_script_progression --message="Updating nginx web server configuration..." --weight=5
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 final_path=/var/www/$app
@@ -90,7 +90,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..." --time --weight=1
+ynh_script_progression --message="Reloading nginx web server..." --weight=2
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -101,4 +101,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for $app" --time --last
+ynh_script_progression --message="Change of URL completed for $app" --last
diff --git a/scripts/install b/scripts/install
index ec67600..b54b211 100644
--- a/scripts/install
+++ b/scripts/install
@@ -28,7 +28,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-ynh_script_progression --message="Validating installation parameters..." --time --weight=1
+ynh_script_progression --message="Validating installation parameters..."
 
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
@@ -44,7 +44,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..." --time --weight=1
+ynh_script_progression --message="Storing installation settings..."
 
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
@@ -53,14 +53,14 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url
 #=================================================
 # Install dependency to convert tracks to a readable format for the browser
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --time --weight=1
+ynh_script_progression --message="Installing dependencies..." --weight=10
 
 ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Configuring system user..." --time --weight=1
+ynh_script_progression --message="Configuring system user..." --weight=3
 
 # Create a system user
 ynh_system_user_create --username=$app
@@ -68,24 +68,23 @@ ynh_system_user_create --username=$app
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Setting up source files..." --time --weight=1
+ynh_script_progression --message="Setting up source files..."
 
 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"
 
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring nginx web server..." --time --weight=1
+ynh_script_progression --message="Configuring nginx web server..." --weight=2
 # Create a dedicated nginx config
 ynh_add_nginx_config
 
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring php-fpm..." --time --weight=1
+ynh_script_progression --message="Configuring php-fpm..." --weight=20
 
 # Create a dedicated php-fpm config
 ynh_add_fpm_config
@@ -102,7 +101,7 @@ ynh_app_setting_delete --app=$app --key=skipped_uris
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring permissions..." --time --weight=1
+ynh_script_progression --message="Configuring permissions..." --weight=8
 
 # Make app public if necessary
 if [ $is_public -eq 1 ]
@@ -123,6 +122,7 @@ cp -a $final_path/config.dist.php $final_path/config.local.php
 key=$(ynh_string_random --length=50)
 # edit config.local.php
 ynh_replace_string --match_string="const SECRET_KEY = '3xUhIgGwuovRKOjVsVPQ5yUMfXUSIOX2GKzcebsz5OINrYC50r';" --replace_string="const SECRET_KEY = '$key';" --target_file="$final_path/config.local.php"
+ynh_replace_string --match_string="const ROOT = __DIR__;" --replace_string="const ROOT = '/var/www/garradin';" --target_file="$final_path/config.local.php"
 if [ "$path_url" == "/" ]; then
   ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url';" --target_file="$final_path/config.local.php"
 else
@@ -132,7 +132,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..." --time --weight=1
+ynh_script_progression --message="Reloading nginx web server..."
 
 systemctl reload nginx
 
@@ -140,4 +140,4 @@ systemctl reload nginx
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of $app completed" --time --last
\ No newline at end of file
+ynh_script_progression --message="Installation of $app completed" --last
\ No newline at end of file
diff --git a/scripts/remove b/scripts/remove
index aac63fd..55ae2da 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..." --weight=2
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -22,7 +22,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Removing dependencies..." --time --weight=1
+ynh_script_progression --message="Removing dependencies..." --time --weight=10
 
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
@@ -30,7 +30,7 @@ ynh_remove_app_dependencies
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Removing app main directory..." --time --weight=1
+ynh_script_progression --message="Removing app main directory..." --time --weight=3
 
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
@@ -38,7 +38,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing nginx web server configuration..." --time --weight=1
+ynh_script_progression --message="Removing nginx web server configuration..."
 
 # Remove the dedicated nginx config
 ynh_remove_nginx_config
@@ -46,7 +46,7 @@ ynh_remove_nginx_config
 #=================================================
 # REMOVE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing php-fpm configuration..." --time --weight=1
+ynh_script_progression --message="Removing php-fpm configuration..." --time --weight=2
 
 # Remove the dedicated php-fpm config
 ynh_remove_fpm_config
@@ -56,7 +56,7 @@ ynh_remove_fpm_config
 #=================================================
 # REMOVE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1
+ynh_script_progression --message="Removing the dedicated system user..." --weight=2
 
 # Delete a system user
 ynh_system_user_delete --username=$app
@@ -65,4 +65,4 @@ ynh_system_user_delete --username=$app
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of $app completed" --time --last
\ No newline at end of file
+ynh_script_progression --message="Removal of $app completed" --last
\ No newline at end of file
diff --git a/scripts/restore b/scripts/restore
index 53d9726..0504490 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -20,7 +20,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading settings..." --time --weight=1
+ynh_script_progression --message="Loading settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -31,7 +31,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
-ynh_script_progression --message="Validating restoration parameters..." --time --weight=1
+ynh_script_progression --message="Validating restoration parameters..." --weight=4
 
 ynh_webpath_available $domain $path_url \
 	|| ynh_die "Path not available: ${domain}${path_url}"
@@ -49,14 +49,14 @@ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..." --time --weight=1
+ynh_script_progression --message="Restoring the app main directory..."
 
 ynh_restore_file "$final_path"
 
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Recreating the dedicated system user..." --time --weight=1
+ynh_script_progression --message="Recreating the dedicated system user..." --weight=3
 
 # Create the dedicated user (if not existing)
 ynh_system_user_create --username=$app
@@ -68,35 +68,34 @@ ynh_system_user_create --username=$app
 # Restore permissions on app files
 chown -R $app:$app $final_path
 
-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restore php-fpm configuration..." --time --weight=1
-
-ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf"
-
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --time --weight=1
+ynh_script_progression --message="Reinstalling dependencies..." --weight=10
 
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
 
+#=================================================
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restore php-fpm configuration..." --weight=30
+
+ynh_restore_file --origin_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
-ynh_script_progression --message="Reloading nginx web server and php-fpm..." --time --weight=1
+ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=1
 
-ynh_systemd_action --service_name=php7.0-fpm --action=reload
+ynh_systemd_action --service_name=php$YNH_PHP_VERSION-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for $app" --time --last
\ No newline at end of file
+ynh_script_progression --message="Restoration completed for $app" --last
\ No newline at end of file
diff --git a/scripts/upgrade b/scripts/upgrade
index 3b3cb6d..4c706c0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..." --weight=3
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -34,7 +34,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --time --weight=1
+ynh_script_progression --message="Ensuring downward compatibility..."
 
 # If final_path doesn't exist, create it
 if [ -z "$final_path" ]; then
@@ -67,11 +67,10 @@ fi
 #=================================================
 # Backup Data
 #=================================================
-ynh_script_progression --message="Backing up the data before upgrading (may take a while)..." --time --weight=1
+ynh_script_progression --message="Backing up the data before upgrading (may take a while)..." --weight=30
 
 bdd=$final_path/association.sqlite
 squelettes=$final_path/www/squelettes
-config=$final_path/config.local.php
 
 if  [ -d "$squelettes" ]; then
   cp -ar $squelettes /tmp/squelettes
@@ -81,14 +80,10 @@ if [ -e "$bdd" ]; then
   cp -a $bdd /tmp/association.sqlite
 fi
 
-if  [ -e "$config" ]; then
-  cp -a $config /tmp/config
-fi
-
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --time --weight=1
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=30
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -114,7 +109,7 @@ ynh_abort_if_errors
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Upgrading source files..." --time --weight=1
+ynh_script_progression --message="Upgrading source files..."
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
@@ -125,14 +120,14 @@ fi
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Upgrading dependencies..." --time --weight=1
+ynh_script_progression --message="Upgrading dependencies..." --time --weight=5
 
 ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1
+ynh_script_progression --message="Making sure dedicated system user exists..."
 
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app
@@ -141,7 +136,7 @@ ynh_system_user_create --username=$app
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading nginx web server configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=2
 
 # Create a dedicated nginx config
 ynh_add_nginx_config
@@ -149,34 +144,18 @@ ynh_add_nginx_config
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading php-fpm configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=2
 
 # Create a dedicated php-fpm config
 ynh_add_fpm_config
 
-#=================================================
-# Change options in file config.dist.php
-# and copy in local.dist.php
-#=================================================
-# ynh_script_progression --message="final configuration needed..." --time --weight=1
-
-#  key=$(ynh_string_random --length=50)
-# cp -a $final_path/config.dist.php $final_path/config.local.php
-#   ynh_replace_string --match_string="const SECRET_KEY = '3xUhIgGwuovRKOjVsVPQ5yUMfXUSIOX2GKzcebsz5OINrYC50r';" --replace_string="const SECRET_KEY = '$key';" --target_file="$final_path/config.local.php"
-# if [ "$path_url" == "/" ]
-# then
-#  ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url';" --target_file="$final_path/config.local.php"
-# else
-#  ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url/';" --target_file="$final_path/config.local.php"
-# fi
 #=======================================================
 # backup bdd, squelettes directory and config.local.php
 #=======================================================
-ynh_script_progression --message="restore data..." --time --weight=1
+ynh_script_progression --message="restore data..." --weight=10
 
 backup_bdd=/tmp/association.sqlite
 backup_squelettes=/tmp/squelettes
-backup_config=/tmp/config
 
 if 	[ -d "$backup_squelettes" ]
 then
@@ -188,19 +167,14 @@ then
 	cp -a $backup_bdd $final_path/association.sqlite
 fi
 
-if [ -e "$backup_config" ]
-then
-  cp -a $backup_config $final_path/config.local.php
+key=$(ynh_string_random --length=50)
+cp -a $final_path/config.dist.php $final_path/config.local.php
+ynh_replace_string --match_string="const SECRET_KEY = '3xUhIgGwuovRKOjVsVPQ5yUMfXUSIOX2GKzcebsz5OINrYC50r';" --replace_string="const SECRET_KEY = '$key';" --target_file="$final_path/config.local.php"
+ynh_replace_string --match_string="const ROOT = __DIR__;" --replace_string="'/var/www/garradin';" --target_file="$final_path/config.local.php"
+if [ "$path_url" == "/" ]; then
+ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url';" --target_file="$final_path/config.local.php"
 else
-  key=$(ynh_string_random --length=50)
-  cp -a $final_path/config.dist.php $final_path/config.local.php
-  ynh_replace_string --match_string="const SECRET_KEY = '3xUhIgGwuovRKOjVsVPQ5yUMfXUSIOX2GKzcebsz5OINrYC50r';" --replace_string="const SECRET_KEY = '$key';" --target_file="$final_path/config.local.php"
-  if [ "$path_url" == "/" ]
-  then
-  ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url';" --target_file="$final_path/config.local.php"
-  else
-  ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url/';" --target_file="$final_path/config.local.php"
-  fi
+ynh_replace_string --match_string="//const WWW_URI = '/asso/';" --replace_string="const WWW_URI = '$path_url/';" --target_file="$final_path/config.local.php"
 fi
 
 #=================================================
@@ -214,7 +188,7 @@ chmod 755 $final_path -R
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Upgrading permissions configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading permissions configuration..." --weight=2
 
 # Create the visitors permission if needed
 if ! ynh_permission_exists --permission "visitors"; then
@@ -224,11 +198,11 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..." --time --weight=1
+ynh_script_progression --message="Reloading nginx web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT
 #=================================================
-ynh_script_progression --message="Upgrade of $app completed" --time --last
\ No newline at end of file
+ynh_script_progression --message="Upgrade of $app completed" --last
\ No newline at end of file