change x to X, add --recursive, add a default acl for new elements

config_panel.toml

@@ -47,7 +47,6 @@ name.fr = "Configuration de Nextcloud"
         help.en = "Mechanism allowing more instantaneous notifications and reduce server load."
         help.fr = "Mécanisme qui permet d'avoir des notifications plus rapides et de réduire la charge du serveur."
 
-
     [main.php_fpm_config]
     name.en = "PHP-FPM configuration"
     name.fr = "Configuration de PHP-FPM"

hooks/post_user_create

@@ -3,4 +3,4 @@
 user="$1"
 app="$(basename $0 | cut -d- -f 2-)" # Extract the app name from the script name, which is supposed to be something like "50-app_id"
 
-setfacl --modify g:$app:rwx /home/$user
+setfacl --recursive --modify g:$app:rwX,d:g:$app:rwX /home/$user

manifest.toml

@@ -70,6 +70,12 @@ ram.runtime = "512M"
     help.en = "<a href=https://github.com/nextcloud/notify_push#about target=_blank>Notify Push</a> is a mechanism allowing more instantaneous notifications and reduce server load. (However, it is still a bit new)"
     help.fr = "<a href=https://github.com/nextcloud/notify_push#about target=_blank>Notify Push</a> est un mécanisme qui permet d'avoir des notifications plus rapides et de réduire la charge du serveur. (Cependant, cette fonctionnalité reste relativement nouvelle)"
 
+    [install.enable_notify_push]
+    ask.en = "Configure the High Performance Backend?"
+    ask.fr = "Configurer le Backend Hautes Performances ?"
+    type = "boolean"
+    default = false
+
 [resources]
 
     [resources.sources]

scripts/backup

@@ -22,7 +22,14 @@ ynh_backup --src_path="$install_dir"
 ynh_backup --src_path="$data_dir" --is_big
 
 #=================================================
-# SYSTEM CONFIGURATION
+# BACKUP THE NGINX CONFIGURATION
+#=================================================
+
+ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.d"
+
+#=================================================
+# BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"

scripts/change_url

@@ -79,6 +79,7 @@ then
     ynh_add_systemd_config --service="${app}-notify-push"
 
     count=0
+
     # cron can sometimes fail when the database is not fully initialized, hence it's retried several times, see https://github.com/YunoHost-Apps/nextcloud_ynh/pull/720
     while ! ynh_exec_as "$app" php${phpversion} --define apc.enable_cli=1 $install_dir/cron.php && [[ $count -lt 30 ]]
     do

scripts/config

@@ -127,6 +127,9 @@ set__enable_notify_push() {
         fi
         exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push
 
+        mkdir -p /var/run/$app/
+        chown $app: /var/run/$app/
+
         case $YNH_ARCH in
             amd64) arch="x86_64";;
             arm64) arch="aarch64";;
@@ -139,6 +142,7 @@ set__enable_notify_push() {
         ynh_add_systemd_config --service="${app}-notify-push"
 
         count=0
+
     # cron can sometimes fail when the database is not fully initialized, hence it's retried several times, see https://github.com/YunoHost-Apps/nextcloud_ynh/pull/720
         while ! ynh_exec_as "$app" php${phpversion} --define apc.enable_cli=1 $install_dir/cron.php && [[ $count -lt 30 ]]
         do

scripts/install

@@ -155,7 +155,7 @@ then
     create_external_storage "/home/\$user" "Home"
     # Iterate over users to extend their home folder permissions
     for u in $(ynh_user_list); do
-        setfacl --modify g:$app:rwx "/home/$u" || true
+        setfacl --recursive --modify g:$app:rwX,d:g:$app:rwX "/home/$u" || true
     done
 fi
 
@@ -212,6 +212,9 @@ then
     exec_occ app:install notify_push
     exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push
 
+    mkdir -p /var/run/$app/
+    chown $app: /var/run/$app/
+
     case $YNH_ARCH in
         amd64) arch="x86_64";;
         arm64) arch="aarch64";;
@@ -297,6 +300,7 @@ ynh_add_fail2ban_config --logpath="/var/log/$app/nextcloud.log" --failregex="^.*
 if [ $enable_notify_push -eq 1 ]
 then
     count=0
+
     # cron can sometimes fail when the database is not fully initialized, hence it's retried several times, see https://github.com/YunoHost-Apps/nextcloud_ynh/pull/720
     while ! ynh_exec_as "$app" php${phpversion} --define apc.enable_cli=1 $install_dir/cron.php && [[ $count -lt 30 ]]
     do

scripts/remove

@@ -26,6 +26,7 @@ ynh_remove_systemd_config --service="${app}-notify-push"
 systemctl disable --now --quiet ${app}-notify-push-watcher.path
 ynh_secure_remove --file="/etc/systemd/system/${app}-notify-push-watcher.path"
 ynh_remove_systemd_config --service="${app}-notify-push-watcher"
+ynh_secure_remove --file="/var/run/$app"
 
 # Remove a cron file
 # TODO: Ensure that cron job is not running (How !?)
@@ -35,7 +36,7 @@ ynh_secure_remove --file="/etc/cron.d/$app"
 for path in /home/*; do
   # Clean ACL in every directories in /home, except those which start with 'yunohost.'
   [[ ! $path == /home/yunohost.* ]] \
-    && setfacl --remove g:$app -- "$path" 2>&1
+    && setfacl --recursive --remove g:$app,d:g:$app -- "$path" 2>&1
 done
 
 #=================================================

scripts/restore

@@ -93,8 +93,7 @@ chmod 750 $install_dir
 # Iterate over users to extend their home folder permissions - for the external
 # storage plugin usage - and create relevant Nextcloud directories
 for u in $(ynh_user_list); do
-    mkdir -p "$data_dir/$u"
-    setfacl --modify g:$app:rwx "/home/$u" || true
+    setfacl --recursive --modify g:$app:rwX,d:g:$app:rwX "/home/$u" || true
 done
 
 #=================================================
@@ -130,6 +129,9 @@ ynh_systemd_action --action=restart --service_name=fail2ban
 
 if [ $enable_notify_push -eq 1 ]
 then
+    mkdir -p /var/run/$app/
+    chown $app: /var/run/$app/
+
     ynh_restore_file --origin_path="/etc/systemd/system/${app}-notify-push.service"
     ynh_restore_file --origin_path="/etc/systemd/system/${app}-notify-push-watcher.service"
     ynh_restore_file --origin_path="/etc/systemd/system/${app}-notify-push-watcher.path"

scripts/upgrade

@@ -311,7 +311,7 @@ then
         || create_external_storage "/home/\$user" "Home"
         # Iterate over users to extend their home folder permissions
         for u in $(ynh_user_list); do
-        setfacl --modify g:$app:rwx "/home/$u" || true
+            setfacl --recursive --modify g:$app:rwX,d:g:$app:rwX "/home/$u" || true
         done
     fi
 
@@ -397,6 +397,9 @@ then
     fi
     exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push
 
+    mkdir -p /var/run/$app/
+    chown $app: /var/run/$app/
+
     case $YNH_ARCH in
         amd64) arch="x86_64";;
         arm64) arch="aarch64";;

tests.toml

@@ -43,3 +43,10 @@ test_format = 1.0
     args.enable_notify_push = "1"
     test_upgrade_from.e9f82ab7.name = "Upgrade from 28.0.6"
     test_upgrade_from.e9f82ab7.args.system_addressbook_exposed = "yes"
+
+[notify_push_test]
+
+    args.enable_notify_push = "1"
+    test_upgrade_from.e9f82ab7.name = "Upgrade from 28.0.6"
+    test_upgrade_from.e9f82ab7.args.system_addressbook_exposed = "yes"
+