From 2d15b132c7d13ca7bcc01b57bc6c5c80ab0f9e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 8 Nov 2023 09:30:30 +0100
Subject: [PATCH] fix

---
 conf/sql/admin.sql | 2 +-
 scripts/install    | 8 ++++----
 scripts/upgrade    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/sql/admin.sql b/conf/sql/admin.sql
index 16c6ba5..b0b2d93 100644
--- a/conf/sql/admin.sql
+++ b/conf/sql/admin.sql
@@ -1,3 +1,3 @@
-INSERT INTO `wt_user` (`user_id`, `user_name`, `real_name`, `email`, `password`) VALUES (NULL, '__USER_NAME__', '__NAME__', '__USER_EMAIL__', '__ADMIN_PASSWORD__');
+INSERT INTO `wt_user` (`user_id`, `user_name`, `real_name`, `email`, `password`) VALUES (NULL, '__USER_NAME__', '__NAME__', '__USER_EMAIL__', '__ADMIN_PASSWORD_HASHED__');
 INSERT INTO `wt_user_setting` (`user_id`, `setting_name`, `setting_value`) VALUES ('1', 'canadmin', '1'), ('1', 'verified', '1'), ('1', 'verified_by_admin', '1');
  
diff --git a/scripts/install b/scripts/install
index 29496b7..6ccb81f 100755
--- a/scripts/install
+++ b/scripts/install
@@ -45,17 +45,17 @@ ynh_script_progression --message="Configuring NGINX web server..."
 ynh_add_nginx_config
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
 
 # Adding the details of the database to the config file
-ynh_add_config --template="../conf/config.ini.php" --destination="$install_dir/data/config.ini.php"
+ynh_add_config --template="config.ini.php" --destination="$install_dir/data/config.ini.php"
 
 # Load initial SQL into the new database
-ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql"
+ynh_mysql_connect_as --user="$db_name" "--password=$db_pwd" < "../conf/sql/webtrees.sql"
 
 # Replace variables in sql scripts
 ynh_replace_string --match_string="__USER_NAME__" --replace_string="$admin_username" --target_file="../conf/sql/admin.sql"
@@ -63,7 +63,7 @@ ynh_replace_string --match_string="__NAME__" --replace_string="$admin_name" --ta
 ynh_replace_string --match_string="__USER_EMAIL__" --replace_string="$admin_email" --target_file="../conf/sql/admin.sql"
 ynh_replace_string --match_string="__ADMIN_PASSWORD_HASHED__" --replace_string="$admin_password_hashed" --target_file="../conf/sql/admin.sql"
 
-ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql"
+ynh_mysql_connect_as --user="$db_name" "--password=$db_pwd" < "../conf/sql/admin.sql"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/upgrade b/scripts/upgrade
index b066dc8..dc41697 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -52,7 +52,7 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
 ynh_add_nginx_config
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 #=================================================
 # END OF SCRIPT