From 8a2337b9e77fa6c48d59ebad60aa565e7ee0de33 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 21 Jan 2021 22:40:50 +0100
Subject: [PATCH] Remove redundant arguments

---
 manifest.json   | 2 +-
 scripts/install | 7 ++-----
 scripts/restore | 2 +-
 scripts/upgrade | 6 +++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/manifest.json b/manifest.json
index 80a04a1..9f63588 100644
--- a/manifest.json
+++ b/manifest.json
@@ -67,7 +67,7 @@
 				"name": "is_public",
 				"type": "boolean",
 				"ask": {
-					"en": "Is it a public Grav site ?",
+					"en": "Is it a public Grav site?",
 					"fr": "Est-ce un site public ?"
 				},
 				"help": {
diff --git a/scripts/install b/scripts/install
index 96f2ed5..85f383a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -38,9 +38,6 @@ ynh_script_progression --message="Validating installation parameters..." --weigh
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
 
-# Normalize the url path syntax
-path_url=$(ynh_normalize_url_path "$path_url")
-
 # Check web path availability
 ynh_webpath_available --domain=$domain --path_url=$path_url
 # Register (book) web path
@@ -73,7 +70,7 @@ ynh_setup_source --dest_dir=$final_path
 ynh_script_progression --message="Configuring NGINX web server..." --weight=1
 
 # Create a dedicated nginx config
-ynh_add_nginx_config YNH_PHP_VERSION
+ynh_add_nginx_config
 
 #=================================================
 # CREATE DEDICATED USER
@@ -89,7 +86,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=3
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --usage=medium --footprint=medium --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=medium --footprint=medium --package="$extra_php_dependencies"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/restore b/scripts/restore
index d1ac9fe..b7f6c90 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -87,7 +87,7 @@ find $final_path -type d -exec chmod +s {} \;
 ynh_restore_file --origin_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
 
 # Recreate a dedicated php-fpm config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 62d0145..f043685 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -121,7 +121,7 @@ fi
 ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
 
 # Create a dedicated nginx config
-ynh_add_nginx_config YNH_PHP_VERSION
+ynh_add_nginx_config
 
 #=================================================
 # CREATE DEDICATED USER
@@ -137,7 +137,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies"
 
 # Delete existing ini configuration file (backward compatibility)
 if [ -f /etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini ]; then
@@ -186,7 +186,7 @@ exec_as $app cp "$final_path/user/plugins/login-ldap/login-ldap.yaml" "$final_pa
 #=================================================
 # SETUP PERMISSIONS
 #=================================================
-ynh_script_progression --message="Configuring permissions..." --time --weight=1
+ynh_script_progression --message="Configuring permissions..." --weight=1
 
 # Giving admin permission to the specified used
 if ! ynh_permission_exists --permission "admin"