From 743b942146d04c0ced59e332b163ee6bd38d8be8 Mon Sep 17 00:00:00 2001
From: Krakinou <misterl56@hotmail.com>
Date: Fri, 18 Aug 2023 23:05:03 +0200
Subject: [PATCH] fix home folder

---
 manifest.toml   |  5 +++--
 scripts/install | 13 +++++++------
 scripts/restore | 21 ++++++++++-----------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index e105641..f4a166a 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -78,15 +78,16 @@ ram.runtime = "350M"
     rend.exposed = "TCP"
 
     [resources.system_user]
+    #UMS require a home path for the user as config files are stored in there
+    home = '/home/yunohost.app/__APP__'
 
     [resources.install_dir]
 
     [resources.data_dir]
-    dir = "/home/yunohost.app/__APP__"
-    subdirs = [ '.config', '.config/UMS' ]
 
     [resources.permissions]
     main.url = "/"
+    main.auth_header=false
 
     [resources.apt]
     packages = "mediainfo dcraw"
diff --git a/scripts/install b/scripts/install
index c77b680..d44bb6b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -57,13 +57,14 @@ ynh_add_systemd_config
 #=================================================
 ynh_script_progression --message="Setting up configuration file.." --weight=5
 
-mkdir -p "$data_dir/.config/UMS"
-ynh_add_config --template="UMS.conf.default" --destination="$data_dir/.config/UMS/UMS.conf"
-ynh_add_config --template="WEB.conf.default" --destination="$data_dir/.config/UMS/WEB.conf"
-ynh_add_config --template="VirtualFolders.conf.default" --destination="$data_dir/.config/UMS/VirtualFolders.conf"
+#UMS read config file from .config/UMS folder
+mkdir -p "/home/yunohost.app/$app/.config/UMS"
+ynh_add_config --template="UMS.conf.default" --destination="/home/yunohost.app/$app/.config/UMS/UMS.conf"
+ynh_add_config --template="WEB.conf.default" --destination="/home/yunohost.app/$app/.config/UMS/WEB.conf"
+ynh_add_config --template="VirtualFolders.conf.default" --destination="/home/yunohost.app/$app/.config/UMS/VirtualFolders.conf"
 
-chown -R $app:$app "$data_dir/.config"
-chmod -R  700 "$data_dir/.config"
+chown -R $app:$app "/home/yunohost.app/$app/.config"
+chmod -R  700 "/home/yunohost.app/$app/.config"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/restore b/scripts/restore
index 7675f4b..7198e5a 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -22,17 +22,6 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:$app "$install_dir"
 chown $app:$app "$install_dir/UMS.sh"
 
-#=================================================
-# RESTORE THE DATA DIRECTORY
-#=================================================
-ynh_script_progression --message="Restoring the data directory..." --weight=1
-
-ynh_restore_file --origin_path="$data_dir" --not_mandatory
-
-# (Same as for install dir)
-chown -R $app:$app "$data_dir"
-chown -R $app:$app "$data_dir/.config"
-chmod -R  700 "$data_dir/.config"
 
 #=================================================
 #SETTING MULTIMEDIA DIRECTORY
@@ -53,10 +42,20 @@ systemctl enable $app.service --quiet
 
 yunohost service add $app --description="A DLNA, UPnP and HTTP(S) Media Server." --log=/var/log/$app/$app.log --needs_exposed_ports $port_rend
 
+
 mkdir -p /var/log/$app
 
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
+#=================================================
+# RESTORE VARIOUS FILES
+#=================================================
+mkdir -p /var/log/$app
+ynh_restore_file --origin_path="/home/yunohost.app/$app/"
+chown -R $app:$app "/home/yunohost.app/$app/.config"
+chmod -R  700 "/home/yunohost.app/$app/.config"
+
+
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================