YunoHost-Apps · zamentur · Dec 19, 2024 · Dec 19, 2024 · Dec 19, 2024 · Dec 19, 2024
diff --git a/README.md b/README.md
@@ -12,13 +12,17 @@ Online storage, file sharing platform and various other applications
 
 [![🌐 Official app website](https://img.shields.io/badge/Official_app_website-darkgreen?style=for-the-badge)](https://nextcloud.com)
 [![App Demo](https://img.shields.io/badge/App_Demo-blue?style=for-the-badge)](https://demo.nextcloud.com/)
-[![Version: 31.0.6~ynh1](https://img.shields.io/badge/Version-31.0.6~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
+[![Version: 30.0.16~ynh1](https://img.shields.io/badge/Version-30.0.16~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
 
 <div align="center">
 <a href="https://apps.yunohost.org/app/nextcloud"><img height="100px" src="https://github.com/YunoHost/yunohost-artwork/raw/refs/heads/main/badges/neopossum-badges/badge_more_info_on_the_appstore.svg"/></a>
 <a href="https://github.com/YunoHost-Apps/nextcloud_ynh/issues"><img height="100px" src="https://github.com/YunoHost/yunohost-artwork/raw/refs/heads/main/badges/neopossum-badges/badge_report_an_issue.svg"/></a>
 </div>
 
+
+## Screenshots
+![Screenshot of Nextcloud](./doc/screenshots/screenshot.png)
+
 ## 📦 Developer info
 
 [![Automatic tests level](https://apps.yunohost.org/badge/cilevel/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)

diff --git a/conf/config.json b/conf/config.json
@@ -44,7 +44,7 @@
       "ldap_cache_ttl": "600",
       "ldap_configuration_active": "1",
       "ldap_display_name": "displayname",
-      "ldap_email_attr": "mail",
+      "ldap_email_attr": "__LDAP_EMAIL_ATTR__",
       "ldap_expert_username_attr": "uid",
       "ldap_group_display_name": "cn",
       "ldap_group_filter": "(&(objectclass=top)(memberUid=*))",

diff --git a/hooks/post_user_create b/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
diff --git a/manifest.toml b/manifest.toml
@@ -5,7 +5,7 @@ name = "Nextcloud"
 description.en = "Online storage, file sharing platform and various other applications"
 description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
 
-version = "31.0.6~ynh1"
+version = "30.0.16~ynh1"
 
 maintainers = ["kay0u"]
 
@@ -55,19 +55,14 @@ ram.runtime = "512M"
     help.fr = "Si activé, le dossier `/home/$user` de chaque compte lui sera ajouté dans Nextcloud."
     type = "boolean"
     default = false
-
+    
 [resources]
 
     [resources.sources]
 
         [resources.sources.main]
-        url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.6.tar.bz2'
-        sha256 = 'a6abce1be84ae65090625895ee5796c6e631fd10cb17645ec4d73f7d9b372628'
-
-        [resources.sources.30]
-        url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.12.tar.bz2'
-        sha256 = '9e19b25f42273d4361218426b4762a766bee408cfa6aa8219f8c27f72095a7a8'
-        prefetch = false
+        url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.16.tar.bz2'
+        sha256 = '6236d4ae76bc444abb53494b3780315a17aac54af1b42e3efe0cc6bd19dff330'
 
         [resources.sources.29]
         url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.16.tar.bz2'

diff --git a/scripts/backup b/scripts/backup
@@ -18,7 +18,7 @@ ynh_backup "$install_dir"
 ynh_backup "$data_dir"
 
 #=================================================
-# SYSTEM CONFIGURATION
+# BACKUP THE NGINX CONFIGURATION
 #=================================================
 
 ynh_backup "/etc/php/$php_version/fpm/pool.d/$app.conf"

diff --git a/scripts/config b/scripts/config
@@ -99,6 +99,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";;
@@ -111,6 +114,7 @@ set__enable_notify_push() {
         ynh_config_add_systemd --service="${app}-notify-push"
 
         count=0
+
         while ! ynh_exec_as_app php${php_version} --define apc.enable_cli=1 $install_dir/cron.php && [[ $count -lt 30 ]]
         do
             sleep 1
@@ -136,7 +140,6 @@ set__enable_forward_email() {
     fi
     ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email"
 }
-
 #=================================================
 # SPECIFIC RUNNERS FOR TOML SHORT KEYS
 #=================================================

diff --git a/scripts/install b/scripts/install
@@ -22,6 +22,10 @@ ynh_app_setting_set --key=enable_notify_push --value=0
 system_addressbook_exposed="0"
 ynh_app_setting_set --key=system_addressbook_exposed --value=0
 
+enable_forward_email="0"
+ynh_app_setting_set --key=enable_forward_email --value=0
+ldap_email_attr="mail"
+
 #=================================================
 # CREATE A MYSQL DATABASE
 #=================================================
@@ -34,6 +38,7 @@ ynh_mysql_db_shell <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE ut
 #=================================================
 ynh_script_progression "Setting up source files..."
 
+# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
 #=================================================
@@ -153,7 +158,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
 
@@ -210,6 +215,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";;

diff --git a/scripts/remove b/scripts/remove
@@ -33,7 +33,7 @@ ynh_safe_rm "/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
 
 #=================================================

diff --git a/scripts/restore b/scripts/restore
@@ -73,8 +73,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
 
 #=================================================

diff --git a/scripts/upgrade b/scripts/upgrade
@@ -30,6 +30,11 @@ if [ -z ${enable_notify_push:-} ]; then
     enable_notify_push=0
 fi
 
+if [ -z ${enable_forward_email:-} ]; then
+    ynh_app_setting_set --key=enable_forward_email --value=0
+    enable_forward_email=0
+fi
+
 # Remove the option backup_core_only if it's in the settings.yml file
 ynh_app_setting_delete --key=backup_core_only
 
@@ -41,6 +46,7 @@ then
     ynh_die "Upgrading from Nextcloud < 22.2 is not supported anymore. You should first upgrade to 22.2 using: yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/41f5f902e7c7cd3c30a6793020562ba98b9bf3e9"
 fi
 
+
 #=================================================
 # MAKE SEQUENTIAL UPGRADES FROM EACH MAJOR
 # VERSION TO THE NEXT ONE
@@ -57,7 +63,7 @@ filter_boring_occ_warnings() {
 # Define a function to execute commands with `occ`
 exec_occ() {
     # Backward compatibility to upgrade from older versions
-    if [ $current_major_version = "$last_major_version" ]
+    if [ $current_major_version -ge 30 ]
     then
         NEXTCLOUD_PHP_VERSION="8.3"
     elif [ $current_major_version -ge 26 ]
@@ -125,7 +131,7 @@ function list_installed_apps_not_compatible_with_future_version()
 current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
 current_major_version=${current_version%%.*}
 
-last_version=$(ynh_read_manifest "resources.sources.main.url" | grep -Eo '[0-9][0-9]\.[0-9]\.[0-9]+')
+last_version=$(ynh_read_manifest "resources.sources.main.url" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
 last_major_version=${last_version%%.*}
 
 if [[ "$last_major_version" != "$current_major_version" ]]
@@ -137,6 +143,15 @@ then
     fi
 fi
 
+# Keep the atrribute choose for ldapEmailAttribute
+ldapEmail=$(exec_occ ldap:show-config "" | grep ldapEmailAttribute)
+if [ "$(echo $ldapEmail | grep -Po "maildrop")" = "maildrop" ]
+then
+    ldap_email_attr="maildrop"
+else
+    ldap_email_attr="mail"
+fi
+
 #=================================================
 # UPGRADE NEXTCLOUD
 #=================================================
@@ -166,62 +181,65 @@ if exec_occ app:list | awk '/Enabled/{f=1;next} /Disabled/{f=0} f' | grep -q -w
     mail_app_must_be_reactived=1
 fi
 
-# While the current version is not the last version, do an upgrade
-while [ "$last_version" != "$current_version" ]
-do
-
-    next_major_version="$(( $current_major_version + 1 ))"
-    if [[ "$next_major_version" -ge "$last_major_version" ]]; then
-        ynh_print_info "Upgrading to Nextcloud $last_version"
-        source_id="main"
-    else
-        ynh_print_info "Upgrading to Nextcloud $next_major_version"
-        source_id="$next_major_version"
-    fi
+# Avoid to downgrade Nextcloud, if channel has changed from stable to oldstable.
+if [[ "$current_major_version" -le "$last_major_version" ]]; then
 
-    # Create a temporary directory
-    tmpdir="${install_dir}__tmp_upgrade"
-
-    ynh_setup_source --dest_dir="$tmpdir" --source_id="$source_id"
-
-    # Backup the config file in the temp dir
-    cp -a "$install_dir/config/config.php" "$tmpdir/config/config.php"
-
-    # Enable maintenance mode
-    exec_occ maintenance:mode --on
-
-    # Backup 3rd party applications from the current Nextcloud
-    # But do not overwrite if there is any upgrade
-    # (apps directory already exists in Nextcloud archive)
-    (
-    cd $install_dir/apps
-    for nc_app_dir in */
+    # While the current version is not the last version, do an upgrade
+    while [ "$last_version" != "$current_version" ]
     do
-      if [ ! -d "$tmpdir/apps/$nc_app_dir" ]
-      then
-        cp -a "$nc_app_dir" "$tmpdir/apps/$nc_app_dir"
-      fi
-    done
-    )
-
-    # Replace the old Nextcloud by the new one
-    ynh_safe_rm "$install_dir"
-    mv "$tmpdir" "$install_dir"
-
-    # Set write access for the following commands
-    chown -R $app:www-data "$install_dir"
-    # Upgrade Nextcloud (SUCCESS = 0, UP_TO_DATE = 3)
-    exec_occ maintenance:mode --off
-    exec_occ upgrade || [ $? -eq 3 ] || ynh_die "Unable to upgrade $app"
-
-    # Get the new current version number
-    current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
-    current_major_version=${current_version%%.*}
-
-    # Print the current version number of Nextcloud
-    exec_occ -V
-done
 
+        next_major_version="$(( $current_major_version + 1 ))"
+        source_id="$next_major_version"
+        if [[ "$next_major_version" -ge "$last_major_version" ]]; then
+            ynh_print_info "Upgrading to Nextcloud $last_version"
+            source_id="main"
+        else
+            ynh_print_info "Upgrading to Nextcloud $next_major_version"
+        fi
+
+        # Create a temporary directory
+        tmpdir="${install_dir}__tmp_upgrade"
+
+        ynh_setup_source --dest_dir="$tmpdir" --source_id="$source_id"
+
+        # Backup the config file in the temp dir
+        cp -a "$install_dir/config/config.php" "$tmpdir/config/config.php"
+
+        # Enable maintenance mode
+        exec_occ maintenance:mode --on
+
+        # Backup 3rd party applications from the current Nextcloud
+        # But do not overwrite if there is any upgrade
+        # (apps directory already exists in Nextcloud archive)
+        (
+        cd $install_dir/apps
+        for nc_app_dir in */
+        do
+        if [ ! -d "$tmpdir/apps/$nc_app_dir" ]
+        then
+            cp -a "$nc_app_dir" "$tmpdir/apps/$nc_app_dir"
+        fi
+        done
+        )
+
+        # Replace the old Nextcloud by the new one
+        ynh_safe_rm "$install_dir"
+        mv "$tmpdir" "$install_dir"
+
+        # Get the new current version number
+        current_version=$(grep OC_VersionString "$install_dir/version.php" | cut -d\' -f2)
+        current_major_version=${current_version%%.*}
+
+        # Set write access for the following commands
+        chown -R $app:www-data "$install_dir"
+        # Upgrade Nextcloud (SUCCESS = 0, UP_TO_DATE = 3)
+        exec_occ maintenance:mode --off
+        exec_occ upgrade || [ $? -eq 3 ] || ynh_die "Unable to upgrade $app"
+
+        # Print the current version number of Nextcloud
+        exec_occ -V
+    done
+fi
 exec_occ db:add-missing-indices -n
 exec_occ db:add-missing-columns -n
 exec_occ db:add-missing-primary-keys -n
@@ -281,7 +299,7 @@ exec_occ maintenance:repair --include-expensive
 # Add dynamic logout URL to the config
 url_base64="$(echo -n "https://$domain$path" | base64)"
 old_logout_url="https://$(cat /etc/yunohost/current_host)/yunohost/sso/?action=logout"
-current_logout_url="$(exec_occ config:system:get logout_url 2> /dev/null)"
+current_logout_url="$(exec_occ config:system:get logout_url 2> /dev/null || echo '')"
 if [[ "$current_logout_url" == "${old_logout_url}" ]] || [[ "$current_logout_url" == "" ]]
 then
     echo "
@@ -396,6 +414,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";;

diff --git a/tests.toml b/tests.toml
@@ -37,8 +37,7 @@ test_format = 1.0
     caldav.logged_on_sso = true
     caldav.expect_content = "This is the WebDAV interface."
 
-#[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"
+[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"