diff --git a/README.md b/README.md index e9d6643..abbfd57 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ In addition to Nextcloud core features, the following are made available with th * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal -**Shipped version:** 27.1.3~ynh1 +**Shipped version:** 27.1.4~ynh1 **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index c400f05..f4fdfaa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal -**Version incluse :** 27.1.3~ynh1 +**Version incluse :** 27.1.4~ynh1 **Démo :** https://demo.nextcloud.com/ diff --git a/conf/nginx.conf b/conf/nginx.conf index 6682370..f418a25 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -150,7 +150,7 @@ location ^~ __PATH__/ { } location ~ / { - if ($request_method ~ ^(PUT|DELETE|PATCH)$) { + if ($request_method ~ ^(PUT|DELETE|PATCH|PROPFIND|PROPPATCH)$) { rewrite ^ __PATH__/index.php$request_uri last; } try_files $uri / __PATH__/index.php$request_uri; diff --git a/hooks/post_user_delete b/hooks/post_user_delete new file mode 100644 index 0000000..d824c12 --- /dev/null +++ b/hooks/post_user_delete @@ -0,0 +1,16 @@ +#!/bin/bash + +source /usr/share/yunohost/helpers + +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" +install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) + +# Define a function to execute commands with `occ` +exec_occ() { + (cd "$install_dir" && ynh_exec_as "$app" \ + php${phpversion} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") +} + +exec_occ user:delete $user diff --git a/manifest.toml b/manifest.toml index 7f33a23..4110e9f 100644 --- 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 = "27.1.3~ynh1" +version = "27.1.4~ynh1" maintainers = ["kay0u"] @@ -22,8 +22,11 @@ cpe = "cpe:2.3:a:nextcloud:nextcloud" yunohost = ">= 11.2" architectures = ["amd64", "arm64", "armhf"] multi_instance = true + ldap = true + sso = true + disk = "50M" ram.build = "500M" ram.runtime = "512M" diff --git a/scripts/upgrade b/scripts/upgrade index 1b41350..9080c49 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,7 +108,7 @@ exec_occ() { if [ $current_major_version = "last" ] || [ $current_major_version -ge 26 ] then NEXTCLOUD_PHP_VERSION=$phpversion - elif [ $current_major_version -ge 25 ] + elif [ $current_major_version -ge 24 ] then NEXTCLOUD_PHP_VERSION="8.1" elif [ $current_major_version -ge 18 ] @@ -117,6 +117,11 @@ exec_occ() { else NEXTCLOUD_PHP_VERSION="7.1" fi + if ! timeout 1 php$NEXTCLOUD_PHP_VERSION 2>/dev/null; then + local pkg_dependencies="$(dpkg-query --show --showformat='${Depends}' ${app}-ynh-deps)" + pkg_dependencies="${pkg_dependencies/$phpversion/$NEXTCLOUD_PHP_VERSION}" + ynh_install_app_dependencies "$pkg_dependencies" + fi (cd "$install_dir" && ynh_exec_as "$app" \ php$NEXTCLOUD_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") } diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 4a851d5..b31e5b5 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="27.1.3" +next_version="27.1.4" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="1d614935245e4a375b4ac991c02f323592b753972f86f88763fd80ed7d275793" +nextcloud_source_sha256="bec65f2166b82c9303baf476c1e424f71aa196dad010ffe4c0c39d03990d594c"