From 5937306642b0ff7620bfa893d5ea4f06ff6bfee7 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Fri, 30 Aug 2024 23:29:59 +0200
Subject: [PATCH] [autopatch] Automatic patch attempt for helpers 2.1

---
 manifest.toml   | 3 ++-
 scripts/install | 9 ++++-----
 scripts/restore | 5 ++---
 scripts/upgrade | 9 ++++-----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index bd14f07..40641a3 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -16,7 +16,7 @@ demo = "https://en.demo.grocy.info/stockoverview"
 code = "https://github.com/grocy/grocy"
 
 [integration]
-yunohost = ">= 11.2.17"
+yunohost = ">= 11.2.18"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
@@ -56,6 +56,7 @@ ram.runtime = "50M"
     [resources.system_user]
 
     [resources.install_dir]
+    group = "www-data:r-x"
 
     [resources.permissions]
     main.url = "/"
diff --git a/scripts/install b/scripts/install
index 99920d9..a941951 100644
--- a/scripts/install
+++ b/scripts/install
@@ -10,9 +10,8 @@ ynh_script_progression "Setting up source files..."
 
 ynh_setup_source --dest_dir="$install_dir"
 
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
+#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
+#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -29,8 +28,8 @@ ynh_script_progression "Adding $app's configuration..."
 
 ynh_config_add --template="config-dist.php" --destination="$install_dir/data/config.php"
 
-chmod 400 "$install_dir/data/config.php"
-chown $app "$install_dir/data/config.php"
+#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/data/config.php"
+#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown $app "$install_dir/data/config.php"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/restore b/scripts/restore
index 0ffe5f2..445bb3e 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -11,9 +11,8 @@ ynh_script_progression "Restoring $app main directory..."
 
 ynh_restore "$install_dir"
 
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
+#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
+#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir"
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index e29b34f..c545628 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,9 +12,8 @@ ynh_setup_source --dest_dir="$install_dir" --keep="data"
 
 ynh_safe_rm "$install_dir/data/viewcache/*"
 
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
+#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
+#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -30,8 +29,8 @@ ynh_config_add_phpfpm
 
 ynh_config_add --template="config-dist.php" --destination="$install_dir/data/config.php"
 
-chmod 400 "$install_dir/data/config.php"
-chown $app "$install_dir/data/config.php"
+#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 "$install_dir/data/config.php"
+#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown $app "$install_dir/data/config.php"
 
 #=================================================
 # END OF SCRIPT