From db239876aa75cd61ca8b8d8201d37edfe917f653 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Oct 2021 08:02:08 +0200
Subject: [PATCH] Fix

---
 conf/config.yml | 2 +-
 scripts/install | 3 +--
 scripts/remove  | 2 +-
 scripts/restore | 2 +-
 scripts/upgrade | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/conf/config.yml b/conf/config.yml
index 7a4191b..a6e20b1 100644
--- a/conf/config.yml
+++ b/conf/config.yml
@@ -9,7 +9,7 @@
 ## This setting is MANDATORY, unless 'database_url' is used.
 ##
 db:
-  user: __DB_NAME__
+  user: __DB_USER__
   password: __DB_PWD__
   host: localhost
   port: 5432
diff --git a/scripts/install b/scripts/install
index 1b29e10..197edb7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -84,7 +84,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2
 
 db_name=$(ynh_sanitize_dbid --db_name=$app)
-db_user=$db_name
+db_user="kemal"
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_psql_test_if_first_run
 ynh_psql_setup_db --db_user=$db_name --db_name=$db_name
@@ -106,7 +106,6 @@ git clone https://github.com/iv-org/invidious "$final_path" --quiet
 # popd
 
 for i in $final_path/config/sql/*.sql ; do
-	ynh_replace_string --match_string="kemal" --replace_string=$db_user --target_file="$i" ;
 	ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "$i" ;
 done
 
diff --git a/scripts/remove b/scripts/remove
index 2382b33..09d89c4 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -19,7 +19,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 port=$(ynh_app_setting_get --app=$app --key=port)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
+db_user="kemal"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 823be32..28b4e7d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -30,7 +30,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 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)
-db_user=$db_name
+db_user="kemal"
 db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 09c9eec..70a8fda 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,7 +22,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
 language=$(ynh_app_setting_get --app=$app --key=language)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
+db_user="kemal"
 db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 
 #=================================================