From 06424323c8ef38af833a205bf17a1175596598f0 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 22 Jul 2021 20:55:30 +0200
Subject: [PATCH] Fix

---
 conf/nginx.conf |  2 +-
 scripts/install | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 2a32082..ed48b0d 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -2,7 +2,7 @@
 location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/webroot;
+  alias __FINALPATH__/galette/webroot/;
 
   if ($scheme = http) {
     rewrite ^ https://$server_name$request_uri? permanent;
diff --git a/scripts/install b/scripts/install
index 3f7dfc8..8855b41 100755
--- a/scripts/install
+++ b/scripts/install
@@ -80,9 +80,6 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
-mv $final_path/galette/* $final_path/
-ynh_secure_remove $final_path/tests
-
 chmod 750 $final_path
 chmod -R o-rwx $final_path
 chown -R $app:www-data $final_path
@@ -109,7 +106,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Configuring Galette..." --weight=1
 
-ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_path/config/config.inc.php"
+ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_path/galette/config/config.inc.php"
 
 #=================================================
 # GENERIC FINALIZATION
@@ -117,13 +114,13 @@ ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_pa
 # SECURE FILES AND DIRECTORIES
 #=================================================
 
-chmod u+rx  $final_path/config
-chmod g+rwx $final_path/config
+chmod u+rx  $final_path/galette/config
+chmod g+rwx $final_path/galette/config
 
 for folder in attachments cache exports files imports logs photos templates_c tempimages
 do
-   chown $app  $final_path/data/$folder
-    chmod g+rwx $final_path/data/$folder
+   chown $app  $final_path/galette/data/$folder
+    chmod g+rwx $final_path/galette/data/$folder
 done
 
 #=================================================
@@ -169,8 +166,8 @@ Password: "$db_pwd"
 Name: "$db_name"
 
 Important! Once done, please remember to run as root or with sudo:
-\`chmod -R 500 "$final_path/config"\`
-\`Remove "$final_path/install"\`
+\`chmod -R 500 "$final_path/galette/config"\`
+\`Remove "$final_path/galette/install"\`
 
 If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/galette_ynh"