From bc20346e6f3253470d0f9718257d20e05dd2194b Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 17 Sep 2020 10:20:09 +0200
Subject: [PATCH] fix

---
 conf/db.example.inc.php | 2 +-
 scripts/install         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/db.example.inc.php b/conf/db.example.inc.php
index 26e9bfb..9427545 100644
--- a/conf/db.example.inc.php
+++ b/conf/db.example.inc.php
@@ -5,7 +5,7 @@ $conf = [
     # The type can be 'pgsql' or 'mysql'
     'type'        => 'pgsql',
     # The database username
-    'username'    => '__DB_USER__',
+    'username'    => '__DB_NAME__',
     # The password
     'password'    => '__DB_PWD__',
     # Where can we find the database ?
diff --git a/scripts/install b/scripts/install
index 6be5949..2f9579c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -123,7 +123,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 
 # Create a dedicated php-fpm config
 #ynh_replace_string --match_string="YHTZ" --replace_string="$timezone" --target_file=../conf/php-fpm.conf
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
 
 #=================================================
@@ -133,7 +133,7 @@ ynh_script_progression --message="Modifying a config file..." --weight=1
 
 cp ../conf/db.example.inc.php  $final_path/config/db.inc.php
 
-ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_user" --target_file="$final_path/config/db.inc.php"
+#ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_user" --target_file="$final_path/config/db.inc.php"
 ynh_replace_string --match_string="__DB_PWD__"  --replace_string="$db_pwd"  --target_file="$final_path/config/db.inc.php"
 ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/config/db.inc.php"
 
@@ -182,8 +182,8 @@ ynh_add_systemd_config
 #=================================================
 # Set-up database and configuration
 #=================================================
-# cd "$final_path"
-# php composer.phar movim:migrate
+cd "$final_path"
+php"${phpversion}" composer.phar $app:migrate
 
 # (
 # 	cd "$final_path"