diff --git a/README.md b/README.md index 3e64c64..d55502f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Online storage, file sharing platform and various other applications -**Shipped version:** 22.2.10~ynh1 +**Shipped version:** 23.0.8~ynh1 + **Demo:** https://demo.nextcloud.com/ diff --git a/README_fr.md b/README_fr.md index eaf70a9..ee21f2b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Stockage en ligne, plateforme de partage de fichiers et diverses autres applications -**Version incluse :** 22.2.10~ynh1 +**Version incluse :** 23.0.8~ynh1 **Démo :** https://demo.nextcloud.com/ diff --git a/check_process b/check_process index ea81cc6..eef530d 100644 --- a/check_process +++ b/check_process @@ -14,16 +14,18 @@ setup_public=1 upgrade=1 #21.0.2 - upgrade=1 from_commit=fa1f0da48d3edbdf5bcb3b8b70a0687b4e878d11 + upgrade=1 from_commit=e249cced99423d8e6743312361f140c1fbdc3a1d + #22.2.3 + upgrade=1 from_commit=892f02888f31b6a0da850a5f8b2e66a151f84750 backup_restore=1 multi_instance=1 - incorrect_path=1 - port_already_use=0 change_url=1 ;;; Options Email= Notification=none ;;; Upgrade options - ; commit=fa1f0da48d3edbdf5bcb3b8b70a0687b4e878d11 - name=Merge pull request #408 from YunoHost-Apps/21.0.2 + ; commit=e249cced99423d8e6743312361f140c1fbdc3a1d + name=Merge pull request #446 from YunoHost-Apps/22.2.0 + ; commit=892f02888f31b6a0da850a5f8b2e66a151f84750 + name=Merge pull request #457 from YunoHost-Apps/testing manifest_arg=domain=DOMAIN&path=PATH&admin=USER&user_home=1& diff --git a/conf/nginx.conf b/conf/nginx.conf index af84758..2678d48 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,7 +8,7 @@ location ^~ /.well-known { location = /.well-known/carddav { return 301 __PATH__/remote.php/dav/; } location = /.well-known/caldav { return 301 __PATH__/remote.php/dav/; } - + location = /.well-known/webfinger { return 301 __PATH__/index.php$uri; } location = /.well-known/nodeinfo { return 301 __PATH__/index.php$uri; } @@ -62,9 +62,6 @@ location ^~ __PATH__/ { # always provides the desired behaviour. index index.php index.html __PATH__/index.php$request_uri; - # Default Cache-Control policy - expires 1m; - # Rule borrowed from `.htaccess` to handle Microsoft DAV clients location = __PATH__/ { if ( $http_user_agent ~ ^DavClnt ) { diff --git a/config_panel.toml b/config_panel.toml index af1a24c..7598044 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -16,7 +16,7 @@ name = "Nextcloud configuration" [main.php_fpm_config.fpm_footprint] ask = "Memory footprint" - type = "select" + type = "select" choices.low = "Low, <= 20Mb per pool" choices.medium = "Medium, between 20Mb and 40Mb per pool" choices.high = "High, > 40Mb per pool" @@ -32,7 +32,7 @@ name = "Nextcloud configuration" [main.php_fpm_config.fpm_usage] ask = "Expected usage" - type = "select" + type = "select" choices = ["low", "medium", "high"] default = "low" - help = "low: Personal usage, behind the sso. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.
medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.
high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding." + help = "low: Personal usage, behind the SSO. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.
medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.
high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding." diff --git a/manifest.json b/manifest.json index 3650de4..3f71cff 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online storage, file sharing platform and various other applications", "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" }, - "version": "22.2.10~ynh1", + "version": "23.0.8~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", @@ -14,24 +14,25 @@ "demo": "https://demo.nextcloud.com/", "admindoc": "https://docs.nextcloud.com/server/stable/admin_manual/", "userdoc": "https://docs.nextcloud.com/server/latest/user_manual/en/", - "code": "https://github.com/nextcloud/server" + "code": "https://github.com/nextcloud/server", + "cpe": "cpe:2.3:a:nextcloud:nextcloud" }, "license": "AGPL-3.0", "maintainer": { - "name": "Kay0u", + "name": "kay0u", "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php8.0-fpm", "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" @@ -66,4 +67,4 @@ } ] } -} +} \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index 84a585a..250f8b5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,10 +1,11 @@ +#!/bin/bash #================================================= # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" -pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" +YNH_PHP_VERSION="8.0" +pkg_dependencies="imagemagick libmagickcore-6.q16-6-extra acl tar smbclient at php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath" #================================================= # EXPERIMENTAL HELPERS diff --git a/scripts/install b/scripts/install index b1dbca1..6742780 100755 --- a/scripts/install +++ b/scripts/install @@ -25,6 +25,7 @@ path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN user_home=$YNH_APP_ARG_USER_HOME is_public=$YNH_APP_ARG_IS_PUBLIC +phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/upgrade b/scripts/upgrade index ca23604..ac739d6 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,6 @@ admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) user_home=$(ynh_app_setting_get --app=$app --key=user_home) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) maintenance_mode=$(ynh_app_setting_get --app=$app --key=maintenance_mode) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) @@ -84,11 +83,6 @@ if [ -z "$fpm_usage" ]; then ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi -# If phpversion doesn't exist, create it -if [ -z "$phpversion" ]; then - phpversion="$YNH_PHP_VERSION" -fi - # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all @@ -101,6 +95,11 @@ if ! ynh_permission_exists --permission="api"; then ynh_permission_create --permission="api" --label="api" --url="re:$domain\/.well-known\/.*" --allowed="visitors" "all_users" --auth_header="false" --show_tile="false" --protected="true" fi +# Delete existing ini configuration file (backward compatibility) +if [ -f /etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini ]; then + ynh_secure_remove --file=/etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -161,26 +160,10 @@ ynh_system_user_create --username=$app #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 -# If php has changed, remove the old fpm config file -if [ "$phpversion" != $YNH_PHP_VERSION ] -then - ynh_backup_if_checksum_is_different --file="/etc/php/$phpversion/fpm/pool.d/$app.conf" - ynh_secure_remove --file="/etc/php/$phpversion/fpm/pool.d/$app.conf" - if [ -f /etc/php/$phpversion/fpm/conf.d/20-$app.ini ]; then - ynh_secure_remove --file="/etc/php/$phpversion/fpm/conf.d/20-$app.ini" - fi - ynh_systemd_action --service_name="php${phpversion}-fpm" --action=reload - - phpversion="$YNH_PHP_VERSION" -fi - # Recreate a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -# Delete existing ini configuration file (backward compatibility) -if [ -f /etc/php/$phpversion/fpm/conf.d/20-$app.ini ]; then - ynh_secure_remove --file=/etc/php/$phpversion/fpm/conf.d/20-$app.ini -fi +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade.d/upgrade.22.sh b/scripts/upgrade.d/upgrade.22.sh new file mode 100644 index 0000000..81844ab --- /dev/null +++ b/scripts/upgrade.d/upgrade.22.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Last available Nextcloud version +next_version="23.0.0" + +# Nextcloud tarball checksum sha256 +nextcloud_source_sha256="c37592abc3b65c8fd28459281a24f414b87af52fc8c2ea979be3f9be75d01a2c" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 035da35..3cee76f 100755 --- 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="22.2.10" +next_version="23.0.8" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="8de167bfcfcaa661245a00a5ac36628e7961951b9fe2dfaf4f8a5aac6907ccdb" +nextcloud_source_sha256="ac3d042253399be25a2aa01c799dec75a1459b6ae453874414f6528cc2ee5061"