From 67b8ae405e9a66dbe45ea785ced79586cbc216d3 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 10 Feb 2022 11:32:52 +0100
Subject: [PATCH] Fix

---
 scripts/install |  3 +++
 scripts/upgrade | 12 ++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index dc467a9..c608bfd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -112,6 +112,9 @@ ynh_script_progression --message="Modifying a config file..."
 ynh_add_config --template="../conf/app.json" --destination="$final_path/config/app.json"
 ynh_add_config --template="../conf/db.json" --destination="$final_path/config/db.json"
 
+chmod 600 "$final_path/config/db.json"
+chown $app:$app "$final_path/config/db.json"
+
 #=================================================
 # SETUP SYSTEMD
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 387bba1..989d4dd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -78,7 +78,7 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config"
+	ynh_setup_source --dest_dir="$final_path"
 fi
 
 chmod 750 "$final_path"
@@ -113,6 +113,7 @@ then
 
 	pushd $final_path
 		ynh_use_nodejs
+		ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm cache clean 2>/dev/null
 	 	ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install 2>/dev/null
 	 	#ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm run-script db-update --production 2>/dev/null
 	popd
@@ -121,10 +122,13 @@ fi
 #=================================================
 # CONFIGURE
 #=================================================
-# ynh_script_progression --message="Modifying a config file..."
+ynh_script_progression --message="Modifying a config file..."
 
-# ynh_add_config --template="../conf/app.json" --destination="$final_path/config/app.json"
-# ynh_add_config --template="../conf/db.json" --destination="$final_path/config/db.json"
+ynh_add_config --template="../conf/app.json" --destination="$final_path/config/app.json"
+ynh_add_config --template="../conf/db.json" --destination="$final_path/config/db.json"
+
+chmod 600 "$final_path/config/db.json"
+chown $app:$app "$final_path/config/db.json"
 
 #=================================================
 # SETUP SYSTEMD