From 225f1bb1b358b41f3c5365ee09471b6e59ca054e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 19 Dec 2024 13:07:17 +0100 Subject: [PATCH 001/185] move function to common.sh (#764) * move function to common.sh * Update config --- scripts/_common.sh | 6 ++++++ scripts/change_url | 6 ------ scripts/config | 6 ------ scripts/install | 6 ------ scripts/restore | 5 ----- 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 33c1736a..19c0decc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,6 +4,12 @@ # COMMON VARIABLES AND CUSTOM HELPERS #================================================= +# Define a function to execute commands with `occ` +exec_occ() { + (cd "$install_dir" && ynh_exec_as_app \ + php${php_version} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") +} + wait_nginx_reload() { # NGINX may take some time to support the new configuration, # wait for the Nextcloud configuration file to disappear from NGINX before checking the CalDAV/CardDAV URL. diff --git a/scripts/change_url b/scripts/change_url index 509b92dc..449c14b4 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -28,12 +28,6 @@ ynh_config_change_url_nginx #================================================= ynh_script_progression "Applying $app specific modifications..." -# Define a function to execute commands with `occ` -exec_occ() { - (cd "$install_dir" && ynh_exec_as_app \ - php${php_version} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") -} - if [ $change_domain -eq 1 ] then # Change the trusted domain diff --git a/scripts/config b/scripts/config index fc45c353..a2939758 100644 --- a/scripts/config +++ b/scripts/config @@ -8,12 +8,6 @@ source /usr/share/yunohost/helpers #================================================= php_version=$(ynh_app_setting_get --key=php_version) -current_fpm_footprint=$(ynh_app_setting_get --key=fpm_footprint) - -exec_occ() { - (cd "$install_dir" && ynh_exec_as_app \ - php${php_version} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") -} #================================================= # SPECIFIC GETTERS FOR TOML SHORT KEY diff --git a/scripts/install b/scripts/install index cd270cc0..69d7ddce 100755 --- a/scripts/install +++ b/scripts/install @@ -72,12 +72,6 @@ ynh_config_add_nginx #================================================= ynh_script_progression "Installing $app..." -# Define a function to execute commands with `occ` -exec_occ() { - (cd "$install_dir" && ynh_exec_as_app \ - php${php_version} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") -} - # Set write access for the following commands chown -R $app:www-data "$install_dir" chown -R $app: "$data_dir" diff --git a/scripts/restore b/scripts/restore index 9be6e2b8..1ed03c8e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -146,11 +146,6 @@ ynh_systemctl --service=nginx --action=reload # CHECK IF NOTIFY_PUSH WORKS #================================================= -exec_occ() { - (cd "$install_dir" && ynh_exec_as_app \ - php${php_version} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") -} - if [ $enable_notify_push -eq 1 ] then count=0 From 773ada7b68f66e4cfa2f33a93cbcbd20ee303876 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 19 Dec 2024 13:11:25 +0100 Subject: [PATCH 002/185] add default_phone_region --- conf/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/config.json b/conf/config.json index bb800325..0063ee9a 100644 --- a/conf/config.json +++ b/conf/config.json @@ -14,6 +14,7 @@ "hashing_default_password": true, "localstorage.allowsymlinks": true, "simpleSignUpLink.shown": false, + "default_phone_region": "", "maintenance_window_start": 1, "mail_smtpmode": "smtp", "mail_smtpport": "25", From 3fb2bb691e88369560ea6fe8321eada5bdd7449e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 19 Dec 2024 13:14:24 +0100 Subject: [PATCH 003/185] Update nginx.conf --- conf/nginx.conf | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 0b6c2fd1..f521457e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,7 @@ -# Add .mjs as a file extension for javascript +# Set .mjs MIME types # Either include it in the default mime.types list # or include you can include that list explicitly and add the file extension +# and include that list explicitly or add the file extension # only for Nextcloud like below: include mime.types; types { @@ -54,8 +55,15 @@ location ^~ __PATH__/ { # for tunning hints client_body_buffer_size 512k; - # HTTP response headers borrowed from Nextcloud `.htaccess` + # HSTS settings + # WARNING: Only add the preload option once you read about + # the consequences in https://hstspreload.org/. This option + # will add the domain to a hardcoded list that is shipped + # in all major browsers and getting removed from this list + # could take several months. #more_set_headers "Strict-Transport-Security: max-age=15768000; includeSubDomains; preload;"; + + # HTTP response headers borrowed from Nextcloud `.htaccess` more_set_headers "Referrer-Policy: no-referrer"; more_set_headers "X-Content-Type-Options: nosniff"; more_set_headers "X-Download-Options: noopen"; From 25341f9ff558099f742262c939a13888a0c22d86 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 19 Dec 2024 13:17:32 +0100 Subject: [PATCH 004/185] Update install --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 69d7ddce..fc4d6455 100755 --- a/scripts/install +++ b/scripts/install @@ -247,10 +247,12 @@ ynh_script_progression "Adding multimedia directories..." # Build YunoHost multimedia directories ynh_multimedia_build_main_dir + # Mount the user directory in Nextcloud exec_occ app:enable files_external create_external_storage "/home/yunohost.multimedia/\$user" "Multimedia" create_external_storage "/home/yunohost.multimedia/share" "Shared multimedia" + # Allow nextcloud to write into these directories ynh_multimedia_addaccess $app From 85c31870a735ffe6521cd7f622317954156c696b Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 20 Dec 2024 03:40:35 +0100 Subject: [PATCH 005/185] Fix upgrade exploding when $app is nextcloud__2, __3 etc because the virtual apt/dpkg package is named with - and not _ (#767) * Update upgrade replace correct file for nextcloud--x-ynh-deps * Update upgrade correct syntax for the helpers --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 12fe5a7b..8a20d119 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -74,7 +74,7 @@ exec_occ() { # will do magic regarding php configuration and $php_version when the php version of the dependencies changes ... php_version=$(ynh_app_setting_get --key=php_version) if [[ "$NEXTCLOUD_PHP_VERSION" != "$php_version" ]]; then - local pkg_dependencies="$(dpkg-query --show --showformat='${Depends}' ${app}-ynh-deps)" + local pkg_dependencies="$(dpkg-query --show --showformat='${Depends}' ${app//_/-}-ynh-deps)" pkg_dependencies="${pkg_dependencies//$php_version/$NEXTCLOUD_PHP_VERSION}" # Packaging v1 ~legacy : ynh_apt_install_dependencies is designed to be called several times # but the second time it will *append* the list of dependencies rather than replace the existing dependencies From 5e4f393d374f66dc4f45378045f8eb53f08f59dd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 20 Dec 2024 03:41:53 +0100 Subject: [PATCH 006/185] Bump package revision --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 6f32edfd..3b7ac246 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 = "30.0.4~ynh1" +version = "30.0.4~ynh2" maintainers = ["kay0u"] From a8378a548f6464e4b1893787c61921de2ba00b60 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 20 Dec 2024 03:41:58 +0100 Subject: [PATCH 007/185] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index f9e03051..dc0c22dc 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Shipped version:** 30.0.4~ynh1 +**Shipped version:** 30.0.4~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md index 19fc4b46..f104760c 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión actual:** 30.0.4~ynh1 +**Versión actual:** 30.0.4~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index a97367ef..120dd6b7 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Paketatutako bertsioa:** 30.0.4~ynh1 +**Paketatutako bertsioa:** 30.0.4~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 276d38be..38500704 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ L'adresse `/.well-known` sera automatiquement configuré pour la synchronisatio Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. -**Version incluse :** 30.0.4~ynh1 +**Version incluse :** 30.0.4~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index 50121dc0..d930a5ec 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión proporcionada:** 30.0.4~ynh1 +**Versión proporcionada:** 30.0.4~ynh2 **Demo:** diff --git a/README_id.md b/README_id.md index 5cf9feaa..3d6cc343 100644 --- a/README_id.md +++ b/README_id.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versi terkirim:** 30.0.4~ynh1 +**Versi terkirim:** 30.0.4~ynh2 **Demo:** diff --git a/README_nl.md b/README_nl.md index 00322ce2..df6b6c37 100644 --- a/README_nl.md +++ b/README_nl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Geleverde versie:** 30.0.4~ynh1 +**Geleverde versie:** 30.0.4~ynh2 **Demo:** diff --git a/README_pl.md b/README_pl.md index 792231a2..2465b2b1 100644 --- a/README_pl.md +++ b/README_pl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Dostarczona wersja:** 30.0.4~ynh1 +**Dostarczona wersja:** 30.0.4~ynh2 **Demo:** diff --git a/README_ru.md b/README_ru.md index 6e60ecff..525a7f1e 100644 --- a/README_ru.md +++ b/README_ru.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Поставляемая версия:** 30.0.4~ynh1 +**Поставляемая версия:** 30.0.4~ynh2 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 23f0f3a9..888ce826 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**分发版本：** 30.0.4~ynh1 +**分发版本：** 30.0.4~ynh2 **演示：** From be58bb1ea1798680a0f803285396526f0387714c Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 21 Dec 2024 14:32:09 +0100 Subject: [PATCH 008/185] Patch (#768) * remove inused patch with YNH 12 * reorder patch --- ...val-in-JS-scripts-for-YunoHost-tile.patch} | 0 ...able-CSPv3-nonce_and_allow-YNH-fonts.patch | 29 ------------------- 2 files changed, 29 deletions(-) rename patches/main/{02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch => 01-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch} (100%) delete mode 100644 patches/main/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch diff --git a/patches/main/02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch b/patches/main/01-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch similarity index 100% rename from patches/main/02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch rename to patches/main/01-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch diff --git a/patches/main/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch b/patches/main/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch deleted file mode 100644 index 1cbbd31a..00000000 --- a/patches/main/01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php -index 993f74ae0e4..c85aadc49db 100644 ---- a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php -+++ b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php -@@ -47,6 +47,10 @@ class ContentSecurityPolicyNonceManager { - * Check if the browser supports CSP v3 - */ - public function browserSupportsCspV3(): bool { -+ // YunoHost patch: disable CSPv3 nonces to: -+ // - avoid white page on first login from YunoHost portal -+ // - allow YunoHost tile display -+ return false; - $browserBlocklist = [ - Request::USER_AGENT_IE, - ]; -diff --git a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php -index b8bbfdb7d67..a51a15ca0e6 100644 ---- a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php -+++ b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php -@@ -493,7 +493,8 @@ class EmptyContentSecurityPolicy { - - if (!empty($this->allowedFontDomains)) { - $policy .= 'font-src ' . implode(' ', $this->allowedFontDomains); -- $policy .= ';'; -+ // YunoHost patch: extend font-src to load data fonts embedded in YunoHost tile script -+ $policy .= ' data:;'; - } - - if (!empty($this->allowedConnectDomains)) { From e938aeb25a13166c17fc715593baf13e2f1717a9 Mon Sep 17 00:00:00 2001 From: loowiz Date: Thu, 26 Dec 2024 03:36:44 +0000 Subject: [PATCH 009/185] Fix fail2ban failregex --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index fc4d6455..51dd414f 100755 --- a/scripts/install +++ b/scripts/install @@ -285,7 +285,7 @@ ynh_config_add_logrotate ynh_script_progression "Configuring Fail2Ban..." # Create a dedicated Fail2Ban config -ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: ''.*$" +ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" --failregex="^.*Login failed: .* \(Remote IP: .*$" #================================================= # CHECK IF NOTIFY_PUSH WORKS diff --git a/scripts/upgrade b/scripts/upgrade index 8a20d119..a4251998 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -425,7 +425,7 @@ ynh_config_add_logrotate #================================================= # Create a dedicated Fail2Ban config -ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: ''.*$" +ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" --failregex="^.*Login failed: .* \(Remote IP: .*$" #================================================= # CHECK IF NOTIFY_PUSH WORKS From 1a1d9d1b468adc5524ba480cc9f4e3520e1e1e53 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 17 Jan 2025 09:47:39 +0100 Subject: [PATCH 010/185] 30.0.5 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3b7ac246..64602115 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 = "30.0.4~ynh2" +version = "30.0.5~ynh1" maintainers = ["kay0u"] @@ -59,8 +59,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2' - sha256 = 'eb6aaba9acef442f2b3e4a996b7ee8a5ed24442f9bba681237fb28ed970e1fa5' + url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.5.tar.bz2' + sha256 = '248c6e6e612ceeeb170c4d25b8579b0af0e6613abdfa07f2fe6993426b781bea' [resources.sources.29] url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2' From 863381ce9fb7fa109467ed37df69f26489d2a62c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 Jan 2025 09:47:43 +0100 Subject: [PATCH 011/185] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index dc0c22dc..1bfe3e70 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Shipped version:** 30.0.4~ynh2 +**Shipped version:** 30.0.5~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index f104760c..ace78493 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión actual:** 30.0.4~ynh2 +**Versión actual:** 30.0.5~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 120dd6b7..3ce0e0ab 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Paketatutako bertsioa:** 30.0.4~ynh2 +**Paketatutako bertsioa:** 30.0.5~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 38500704..9c601c1d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ L'adresse `/.well-known` sera automatiquement configuré pour la synchronisatio Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. -**Version incluse :** 30.0.4~ynh2 +**Version incluse :** 30.0.5~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index d930a5ec..45ca9c68 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión proporcionada:** 30.0.4~ynh2 +**Versión proporcionada:** 30.0.5~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 3d6cc343..dd14aea2 100644 --- a/README_id.md +++ b/README_id.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versi terkirim:** 30.0.4~ynh2 +**Versi terkirim:** 30.0.5~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index df6b6c37..c8e5b034 100644 --- a/README_nl.md +++ b/README_nl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Geleverde versie:** 30.0.4~ynh2 +**Geleverde versie:** 30.0.5~ynh1 **Demo:** diff --git a/README_pl.md b/README_pl.md index 2465b2b1..0a131134 100644 --- a/README_pl.md +++ b/README_pl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Dostarczona wersja:** 30.0.4~ynh2 +**Dostarczona wersja:** 30.0.5~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index 525a7f1e..f503fe6f 100644 --- a/README_ru.md +++ b/README_ru.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Поставляемая версия:** 30.0.4~ynh2 +**Поставляемая версия:** 30.0.5~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 888ce826..f46ba2f1 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**分发版本：** 30.0.4~ynh2 +**分发版本：** 30.0.5~ynh1 **演示：** From ced3d917a2cba8f958c56af25d119e26ed3e349c Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 19 Jan 2025 12:52:05 +0100 Subject: [PATCH 012/185] Update restore --- scripts/restore | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/restore b/scripts/restore index 1ed03c8e..82f94948 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,6 +10,13 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" +#================================================= +# RESTORE THE DATA DIRECTORY +#================================================= +ynh_script_progression "Restoring data directory..." + +ynh_restore "$data_dir" + #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -64,13 +71,6 @@ ynh_script_progression "Restoring the logrotate configuration..." ynh_restore "/etc/logrotate.d/$app" -#================================================= -# RESTORE THE DATA DIRECTORY -#================================================= -ynh_script_progression "Restoring data directory..." - -ynh_restore "$data_dir" - #================================================= # RESTORE USER RIGHTS #================================================= From dc0fb3debaed4d684013a5872405045734d20dce Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:30:19 +0100 Subject: [PATCH 013/185] Update upgrade (#777) --- scripts/upgrade | 308 ++++++++++++++++++++++++------------------------ 1 file changed, 153 insertions(+), 155 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8a20d119..855b8601 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,187 +137,185 @@ then fi fi -# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed -if ynh_app_upstream_version_changed -then - ynh_script_progression "Upgrading $app..." +#================================================= +# UPGRADE NEXTCLOUD +#================================================= +ynh_script_progression "Upgrading $app..." - # Set write access for the following commands - chown -R $app:www-data "$install_dir" - # Print the current version number of Nextcloud - exec_occ -V +# Set write access for the following commands +chown -R $app:www-data "$install_dir" +# Print the current version number of Nextcloud +exec_occ -V + +if [ "$(exec_occ config:system:get mysql.utf8mb4)" != "true" ]; then + db_pwd=$(ynh_app_setting_get --key=db_pwd) + # Change your databases character set and collation + ynh_mysql_db_shell <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" + # Set the mysql.utf8mb4 config to true in config.php + exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true" + exec_occ maintenance:repair +fi - if [ "$(exec_occ config:system:get mysql.utf8mb4)" != "true" ]; then - db_pwd=$(ynh_app_setting_get --key=db_pwd) - # Change your databases character set and collation - ynh_mysql_db_shell <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" - # Set the mysql.utf8mb4 config to true in config.php - exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true" - exec_occ maintenance:repair - fi +# Upgrade may fail if this app is enabled +# Take all apps enabled, and check if mail is one of them +# Then temporary disable the mail app +mail_app_must_be_reactived=0 + +if exec_occ app:list | awk '/Enabled/{f=1;next} /Disabled/{f=0} f' | grep -q -w mail; then + exec_occ app:disable mail + mail_app_must_be_reactived=1 +fi - # Upgrade may fail if this app is enabled - # Take all apps enabled, and check if mail is one of them - # Then temporary disable the mail app - mail_app_must_be_reactived=0 +# While the current version is not the last version, do an upgrade +while [ "$last_version" != "$current_version" ] +do - if exec_occ app:list | awk '/Enabled/{f=1;next} /Disabled/{f=0} f' | grep -q -w mail; then - exec_occ app:disable mail - mail_app_must_be_reactived=1 + 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 - # While the current version is not the last version, do an upgrade - while [ "$last_version" != "$current_version" ] - do + # Create a temporary directory + tmpdir="${install_dir}__tmp_upgrade" + + ynh_setup_source --dest_dir="$tmpdir" --source_id="$source_id" - 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 - - # 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" - - # 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 + # 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 + ) - exec_occ db:add-missing-indices -n - exec_occ db:add-missing-columns -n - exec_occ db:add-missing-primary-keys -n - exec_occ db:convert-filecache-bigint -n + # Replace the old Nextcloud by the new one + ynh_safe_rm "$install_dir" + mv "$tmpdir" "$install_dir" - #================================================= - # CONFIGURE NEXTCLOUD - #================================================= - ynh_script_progression "Reconfiguring $app..." + # 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" - # Verify the checksum and backup the file if it's different - ynh_backup_if_checksum_is_different "$install_dir/config/config.php" + # 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 - nc_conf="${install_dir}/config.json" - ynh_config_add --template="config.json" --destination="$nc_conf" +exec_occ db:add-missing-indices -n +exec_occ db:add-missing-columns -n +exec_occ db:add-missing-primary-keys -n +exec_occ db:convert-filecache-bigint -n - # Reneable the mail app - if [ $mail_app_must_be_reactived -eq 1 ]; then - exec_occ app:enable mail - fi +#================================================= +# CONFIGURE NEXTCLOUD +#================================================= +ynh_script_progression "Reconfiguring $app..." - # Ensure that UpdateNotification app is disabled - exec_occ app:disable updatenotification +# Verify the checksum and backup the file if it's different +ynh_backup_if_checksum_is_different "$install_dir/config/config.php" - # Enable LDAP plugin - exec_occ app:enable user_ldap +nc_conf="${install_dir}/config.json" +ynh_config_add --template="config.json" --destination="$nc_conf" - # Update all installed apps - exec_occ app:update --all +# Reneable the mail app +if [ $mail_app_must_be_reactived -eq 1 ]; then + exec_occ app:enable mail +fi - # move the logs from the data_dir to the standard /var/log - # it would be better in the ENSURE DOWNWARD COMPATIBILITY section - # but it must be after the exec_occ() definition, so it's here - if [ -f "$data_dir/data/nextcloud.log" ]; then - mkdir -p "/var/log/$app" - chmod 750 "/var/log/$app" - mv "$data_dir"/data/nextcloud.log* "/var/log/$app" - # adapt the nextcloud config - exec_occ config:system:set logfile --value="/var/log/$app/nextcloud.log" - fi +# Ensure that UpdateNotification app is disabled +exec_occ app:disable updatenotification - # Load the config file in nextcloud - exec_occ config:import "$nc_conf" +# Enable LDAP plugin +exec_occ app:enable user_ldap - # Then remove the config file - ynh_safe_rm "$nc_conf" +# Update all installed apps +exec_occ app:update --all - #================================================= - # ALLOW USERS TO DISCONNECT FROM NEXTCLOUD - #================================================= +# move the logs from the data_dir to the standard /var/log +# it would be better in the ENSURE DOWNWARD COMPATIBILITY section +# but it must be after the exec_occ() definition, so it's here +if [ -f "$data_dir/data/nextcloud.log" ]; then + mkdir -p "/var/log/$app" + chmod 750 "/var/log/$app" + mv "$data_dir"/data/nextcloud.log* "/var/log/$app" + # adapt the nextcloud config + exec_occ config:system:set logfile --value="/var/log/$app/nextcloud.log" +fi - # 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)" - if [[ "$current_logout_url" == "${old_logout_url}" ]] || [[ "$current_logout_url" == "" ]] - then - echo " - //-YunoHost- - // set logout_url according to main domain - \$main_domain = file_get_contents('/etc/yunohost/current_host'); - \$CONFIG['logout_url'] = 'https://'.\$main_domain.'/yunohost/sso/?action=logout&r=${url_base64}'; - //-YunoHost- - " >> "$install_dir/config/config.php" - fi +# Load the config file in nextcloud +exec_occ config:import "$nc_conf" - #================================================= - # CHANGE HOSTNAME FOR ACTIVITY NOTIFICATIONS - #================================================= - - exec_occ config:system:set overwrite.cli.url --value="https://${domain}${path}" - - #================================================= - # MOUNT HOME FOLDERS AS EXTERNAL STORAGE - #================================================= - - # Enable External Storage and create local mount to home folder as needed - if [ $user_home -eq 1 ]; then - exec_occ app:enable files_external - exec_occ files_external:list --output=json \ - | grep -q '"storage":"\\\\OC\\\\Files\\\\Storage\\\\Local"' \ - || 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 - done - fi +# Then remove the config file +ynh_safe_rm "$nc_conf" + +#================================================= +# ALLOW USERS TO DISCONNECT FROM NEXTCLOUD +#================================================= + +# 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)" +if [[ "$current_logout_url" == "${old_logout_url}" ]] || [[ "$current_logout_url" == "" ]] +then + echo " +//-YunoHost- +// set logout_url according to main domain +\$main_domain = file_get_contents('/etc/yunohost/current_host'); +\$CONFIG['logout_url'] = 'https://'.\$main_domain.'/yunohost/sso/?action=logout&r=${url_base64}'; +//-YunoHost- + " >> "$install_dir/config/config.php" +fi + +#================================================= +# CHANGE HOSTNAME FOR ACTIVITY NOTIFICATIONS +#================================================= + +exec_occ config:system:set overwrite.cli.url --value="https://${domain}${path}" - #================================================= - # STORE THE CHECKSUM OF THE CONFIG FILE - #================================================= +#================================================= +# MOUNT HOME FOLDERS AS EXTERNAL STORAGE +#================================================= - # Calculate and store the config file checksum into the app settings - ynh_store_file_checksum "${install_dir}/config/config.php" +# Enable External Storage and create local mount to home folder as needed +if [ $user_home -eq 1 ]; then + exec_occ app:enable files_external + exec_occ files_external:list --output=json \ + | grep -q '"storage":"\\\\OC\\\\Files\\\\Storage\\\\Local"' \ + || 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 + done fi +#================================================= +# STORE THE CHECKSUM OF THE CONFIG FILE +#================================================= + +# Calculate and store the config file checksum into the app settings +ynh_store_file_checksum "${install_dir}/config/config.php" + #================================================= # REGEN PERMISSIONS #================================================= From c6489b629415cd5d3ac9638d2e9bfc546cf6c43d Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:32:58 +0100 Subject: [PATCH 014/185] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 855b8601..0b8bbd11 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -217,6 +217,7 @@ do # 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 From 57b41db5c3b26b3202ef944f5d51ea2618acf3d9 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:33:31 +0100 Subject: [PATCH 015/185] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 64602115..46fae87f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ code = "https://github.com/nextcloud/server" cpe = "cpe:2.3:a:nextcloud:nextcloud" [integration] -yunohost = ">= 12.0.9" +yunohost = ">= 12.0.10" helpers_version = "2.1" architectures = ["amd64", "arm64", "armhf"] multi_instance = true From 8947bb8b22f4956121504430acdf6aad36afd5c8 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 21 Jan 2025 09:19:48 +0100 Subject: [PATCH 016/185] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 46fae87f..64602115 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ code = "https://github.com/nextcloud/server" cpe = "cpe:2.3:a:nextcloud:nextcloud" [integration] -yunohost = ">= 12.0.10" +yunohost = ">= 12.0.9" helpers_version = "2.1" architectures = ["amd64", "arm64", "armhf"] multi_instance = true From 4c23d650cfb58d51e39929346d168807dd0d994d Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 Jan 2025 12:22:34 +0100 Subject: [PATCH 017/185] Update post_user_delete (#778) --- hooks/post_user_delete | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/post_user_delete b/hooks/post_user_delete index 7d49d24b..83908ca5 100644 --- a/hooks/post_user_delete +++ b/hooks/post_user_delete @@ -9,7 +9,7 @@ php_version=$(ynh_app_setting_get --app=$app --key=php_version) # Define a function to execute commands with `occ` exec_occ() { - (cd "$install_dir" && ynh_exec_as_app \ + (cd "$install_dir" && sudo -u $app \ php${php_version} --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") } From 7f1b13d772b897435c7c1a5cc7a8ce97c78594f9 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 30 Jan 2025 20:24:27 +0100 Subject: [PATCH 018/185] Update upgrade (#779) --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 0b8bbd11..d9faaae7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -269,6 +269,11 @@ exec_occ config:import "$nc_conf" # Then remove the config file ynh_safe_rm "$nc_conf" +# Occasionally new mimetypes are added to better handle certain file types. +# Migrating the mimetypes take a long time on larger instances +# so this is not done automatically during upgrades. +exec_occ maintenance:repair --include-expensive + #================================================= # ALLOW USERS TO DISCONNECT FROM NEXTCLOUD #================================================= From 8fa00f93db0f5b301749cf1194d94327c5f6db86 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 6 Feb 2025 00:14:24 +0100 Subject: [PATCH 019/185] [fix] Remove eval JS patch cause yunohost tiles doesn't exists anymore --- ...r-eval-in-JS-scripts-for-YunoHost-tile.patch | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 patches/main/01-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch diff --git a/patches/main/01-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch b/patches/main/01-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch deleted file mode 100644 index abe9ad45..00000000 --- a/patches/main/01-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch +++ /dev/null @@ -1,17 +0,0 @@ - lib/public/AppFramework/Http/ContentSecurityPolicy.php | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/public/AppFramework/Http/ContentSecurityPolicy.php b/lib/public/AppFramework/Http/ContentSecurityPolicy.php -index e9ecf00036..8e69c8d2dc 100644 ---- a/lib/public/AppFramework/Http/ContentSecurityPolicy.php -+++ b/lib/public/AppFramework/Http/ContentSecurityPolicy.php -@@ -42,7 +42,8 @@ class ContentSecurityPolicy extends EmptyContentSecurityPolicy { - /** @var bool Whether inline JS snippets are allowed */ - protected $inlineScriptAllowed = false; - /** @var bool Whether eval in JS scripts is allowed */ -- protected $evalScriptAllowed = false; -+ // YunoHost patch: allow for eval in JS scripts for YunoHost tile -+ protected $evalScriptAllowed = true; - /** @var bool Whether WebAssembly compilation is allowed */ - protected ?bool $evalWasmAllowed = false; - /** @var bool Whether strict-dynamic should be set */ From b9d53ed027398676277b3d7373ebddb39a8af22e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Feb 2025 10:07:12 +0100 Subject: [PATCH 020/185] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 64602115..f69f3351 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 = "30.0.5~ynh1" +version = "30.0.5~ynh2" maintainers = ["kay0u"] From 11eb850b90fda26106a0585e5ff50205b9271a0f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Feb 2025 10:07:16 +0100 Subject: [PATCH 021/185] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 1bfe3e70..d526eceb 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Shipped version:** 30.0.5~ynh1 +**Shipped version:** 30.0.5~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md index ace78493..9aad9309 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión actual:** 30.0.5~ynh1 +**Versión actual:** 30.0.5~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index 3ce0e0ab..fb061c7e 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Paketatutako bertsioa:** 30.0.5~ynh1 +**Paketatutako bertsioa:** 30.0.5~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 9c601c1d..b5d5bc9c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ L'adresse `/.well-known` sera automatiquement configuré pour la synchronisatio Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. -**Version incluse :** 30.0.5~ynh1 +**Version incluse :** 30.0.5~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index 45ca9c68..e2f0ba1f 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión proporcionada:** 30.0.5~ynh1 +**Versión proporcionada:** 30.0.5~ynh2 **Demo:** diff --git a/README_id.md b/README_id.md index dd14aea2..e35ecdbd 100644 --- a/README_id.md +++ b/README_id.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versi terkirim:** 30.0.5~ynh1 +**Versi terkirim:** 30.0.5~ynh2 **Demo:** diff --git a/README_nl.md b/README_nl.md index c8e5b034..31cd3d20 100644 --- a/README_nl.md +++ b/README_nl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Geleverde versie:** 30.0.5~ynh1 +**Geleverde versie:** 30.0.5~ynh2 **Demo:** diff --git a/README_pl.md b/README_pl.md index 0a131134..3f2ad5f8 100644 --- a/README_pl.md +++ b/README_pl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Dostarczona wersja:** 30.0.5~ynh1 +**Dostarczona wersja:** 30.0.5~ynh2 **Demo:** diff --git a/README_ru.md b/README_ru.md index f503fe6f..00d6152e 100644 --- a/README_ru.md +++ b/README_ru.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Поставляемая версия:** 30.0.5~ynh1 +**Поставляемая версия:** 30.0.5~ynh2 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index f46ba2f1..0b6f2b81 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**分发版本：** 30.0.5~ynh1 +**分发版本：** 30.0.5~ynh2 **演示：** From 577da1f05a2e6b62cc18a99f6843a6a45ac92398 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Feb 2025 10:12:10 +0100 Subject: [PATCH 022/185] cleaning --- scripts/restore | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/scripts/restore b/scripts/restore index 82f94948..c1499b34 100755 --- a/scripts/restore +++ b/scripts/restore @@ -25,20 +25,14 @@ ynh_script_progression "Restoring the MySQL database..." ynh_mysql_db_shell < ./db.sql #================================================= -# RESTORE THE PHP-FPM CONFIGURATION +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression "Reconfiguring PHP-FPM..." +ynh_script_progression "Restoring system configurations related to $app..." -# Restore the file first, so it can have a backup if different ynh_restore "/etc/php/$php_version/fpm/pool.d/$app.conf" -# Recreate a dedicated PHP-FPM config ynh_config_add_phpfpm -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= - ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore "/etc/nginx/conf.d/$domain.d/$app.d" @@ -52,23 +46,13 @@ then fi #================================================= -# RESTORE THE CRON FILE +# RESTORE VARIOUS FILES #================================================= -ynh_script_progression "Restoring cron job..." ynh_restore "/etc/cron.d/$app" -#================================================= -# RESTORE LOGS -#================================================= - ynh_restore "/var/log/$app" -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression "Restoring the logrotate configuration..." - ynh_restore "/etc/logrotate.d/$app" #================================================= From 529c3686a156eceaa64b7a7d48263298d463d59d Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Feb 2025 10:14:16 +0100 Subject: [PATCH 023/185] cleaning --- scripts/install | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index fc4d6455..8a4a4ac7 100755 --- a/scripts/install +++ b/scripts/install @@ -276,7 +276,6 @@ chmod 750 $install_dir #================================================= ynh_script_progression "Configuring log rotation..." -# Use logrotate to manage application logfile(s) ynh_config_add_logrotate #================================================= @@ -284,7 +283,6 @@ ynh_config_add_logrotate #================================================= ynh_script_progression "Configuring Fail2Ban..." -# Create a dedicated Fail2Ban config ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: ''.*$" #================================================= From a4c2c066d3a15d35b60439818b9a54928ade1c41 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Feb 2025 10:35:11 +0100 Subject: [PATCH 024/185] Update remove --- scripts/remove | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/remove b/scripts/remove index c506c10c..ea4e0f9b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -8,15 +8,15 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Removing system configurations related to $app..." +ynh_config_remove_fail2ban + +ynh_config_remove_logrotate + ynh_config_remove_nginx ynh_safe_rm "/etc/nginx/conf.d/$domain.d/$app.d" ynh_config_remove_phpfpm -ynh_config_remove_logrotate - -ynh_config_remove_fail2ban - # Remove notify push if [ $enable_notify_push -eq 1 ]; then ynh_config_remove_systemd"${app}-notify-push" From 83bb5a6cc21e5275f47785637490284f529a108b Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Tue, 11 Feb 2025 14:48:16 +0100 Subject: [PATCH 025/185] [enh] Allow login by mail (#783) --- conf/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.json b/conf/config.json index 0063ee9a..e108e51e 100644 --- a/conf/config.json +++ b/conf/config.json @@ -50,7 +50,7 @@ "ldap_groupfilter_objectclass": "posixGroup", "ldap_group_member_assoc_attribute": "memberUid", "ldap_host": "localhost", - "ldap_login_filter": "(&(|(objectclass=posixAccount))(uid=%uid)(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))", + "ldap_login_filter": "(&(|(objectclass=posixAccount))(|(uid=%uid)(mail=%uid))(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))", "ldap_login_filter_mode": "0", "ldap_port": "389", "ldap_quota_attr": "userquota", From 0d856a8c0395cb6287f976c47453b548af169384 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Feb 2025 21:03:20 +0100 Subject: [PATCH 026/185] 30.0.6 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index f69f3351..c994cbdc 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 = "30.0.5~ynh2" +version = "30.0.6~ynh1" maintainers = ["kay0u"] @@ -59,8 +59,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.5.tar.bz2' - sha256 = '248c6e6e612ceeeb170c4d25b8579b0af0e6613abdfa07f2fe6993426b781bea' + url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.6.tar.bz2' + sha256 = 'ac0e091be6920965dc0c82f149b632d6b5ade7adee84a7b3c8cfd847450a8ddc' [resources.sources.29] url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2' From 5e7de8c8df361f918523d976b61b583f843678f0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Feb 2025 21:03:24 +0100 Subject: [PATCH 027/185] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d526eceb..3eec8fec 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Shipped version:** 30.0.5~ynh2 +**Shipped version:** 30.0.6~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 9aad9309..8286278b 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión actual:** 30.0.5~ynh2 +**Versión actual:** 30.0.6~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index fb061c7e..7688fe31 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Paketatutako bertsioa:** 30.0.5~ynh2 +**Paketatutako bertsioa:** 30.0.6~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index b5d5bc9c..a4850403 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ L'adresse `/.well-known` sera automatiquement configuré pour la synchronisatio Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. -**Version incluse :** 30.0.5~ynh2 +**Version incluse :** 30.0.6~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index e2f0ba1f..e66c995f 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión proporcionada:** 30.0.5~ynh2 +**Versión proporcionada:** 30.0.6~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index e35ecdbd..051c1230 100644 --- a/README_id.md +++ b/README_id.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versi terkirim:** 30.0.5~ynh2 +**Versi terkirim:** 30.0.6~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index 31cd3d20..41995790 100644 --- a/README_nl.md +++ b/README_nl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Geleverde versie:** 30.0.5~ynh2 +**Geleverde versie:** 30.0.6~ynh1 **Demo:** diff --git a/README_pl.md b/README_pl.md index 3f2ad5f8..e14d8ff4 100644 --- a/README_pl.md +++ b/README_pl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Dostarczona wersja:** 30.0.5~ynh2 +**Dostarczona wersja:** 30.0.6~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index 00d6152e..ca769b70 100644 --- a/README_ru.md +++ b/README_ru.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Поставляемая версия:** 30.0.5~ynh2 +**Поставляемая версия:** 30.0.6~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 0b6f2b81..361abf38 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**分发版本：** 30.0.5~ynh2 +**分发版本：** 30.0.6~ynh1 **演示：** From a902183db56fa392c8b29025bdf74021ace6c3b4 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 15 Feb 2025 13:44:13 +0100 Subject: [PATCH 028/185] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index c994cbdc..716fd55f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -63,8 +63,8 @@ ram.runtime = "512M" sha256 = 'ac0e091be6920965dc0c82f149b632d6b5ade7adee84a7b3c8cfd847450a8ddc' [resources.sources.29] - url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2' - sha256 = 'a5863d9f13af177f27d883317f96c3d176e7b1ca70b0ddd7958494582b494577' + url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2' + sha256 = 'c020354ff3e1d2087370f70e058fe171713636ba0f073a5194adbdff3c1cafc6' prefetch = false [resources.sources.28] From 631ac0c62432b587b8d85d2276cc22048d26a2a3 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 16 Feb 2025 09:49:38 +0100 Subject: [PATCH 029/185] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 716fd55f..2f228443 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 = "30.0.6~ynh1" +version = "30.0.6~ynh2" maintainers = ["kay0u"] From 5d711270e86d7bc220d259dec5fdfc36ade993d7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 16 Feb 2025 09:49:44 +0100 Subject: [PATCH 030/185] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 3eec8fec..6ee7e5fb 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Shipped version:** 30.0.6~ynh1 +**Shipped version:** 30.0.6~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md index 8286278b..ede697a7 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión actual:** 30.0.6~ynh1 +**Versión actual:** 30.0.6~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index 7688fe31..1e8b8692 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Paketatutako bertsioa:** 30.0.6~ynh1 +**Paketatutako bertsioa:** 30.0.6~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index a4850403..10b3fc93 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ L'adresse `/.well-known` sera automatiquement configuré pour la synchronisatio Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. -**Version incluse :** 30.0.6~ynh1 +**Version incluse :** 30.0.6~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index e66c995f..2aa8e477 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión proporcionada:** 30.0.6~ynh1 +**Versión proporcionada:** 30.0.6~ynh2 **Demo:** diff --git a/README_id.md b/README_id.md index 051c1230..5c43ec19 100644 --- a/README_id.md +++ b/README_id.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versi terkirim:** 30.0.6~ynh1 +**Versi terkirim:** 30.0.6~ynh2 **Demo:** diff --git a/README_nl.md b/README_nl.md index 41995790..3448a610 100644 --- a/README_nl.md +++ b/README_nl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Geleverde versie:** 30.0.6~ynh1 +**Geleverde versie:** 30.0.6~ynh2 **Demo:** diff --git a/README_pl.md b/README_pl.md index e14d8ff4..4dacb323 100644 --- a/README_pl.md +++ b/README_pl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Dostarczona wersja:** 30.0.6~ynh1 +**Dostarczona wersja:** 30.0.6~ynh2 **Demo:** diff --git a/README_ru.md b/README_ru.md index ca769b70..1927610d 100644 --- a/README_ru.md +++ b/README_ru.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Поставляемая версия:** 30.0.6~ynh1 +**Поставляемая версия:** 30.0.6~ynh2 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 361abf38..86c17fa6 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**分发版本：** 30.0.6~ynh1 +**分发版本：** 30.0.6~ynh2 **演示：** From 11e30da87e2b9bb2c34ac6e4eb6ee335e4491ef1 Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 18 Feb 2025 06:56:25 +0100 Subject: [PATCH 031/185] [enh] Create custom fail2ban conf, with datepattern and more regex to catch (#785) --- conf/f2b_filter.conf | 8 ++++++++ conf/f2b_jail.conf | 6 ++++++ scripts/install | 2 +- scripts/upgrade | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 conf/f2b_filter.conf create mode 100644 conf/f2b_jail.conf diff --git a/conf/f2b_filter.conf b/conf/f2b_filter.conf new file mode 100644 index 00000000..b212bb40 --- /dev/null +++ b/conf/f2b_filter.conf @@ -0,0 +1,8 @@ +[INCLUDES] +before = common.conf +[Definition] +_groupsre = (?:(?:,?\s*"\w+":(?:"[^"]+"|\w+))*) +failregex = ^\{%(_groupsre)s,?\s*"remoteAddr":""%(_groupsre)s,?\s*"message":"Login failed: + ^\{%(_groupsre)s,?\s*"remoteAddr":""%(_groupsre)s,?\s*"message":"Two-factor challenge failed: + ^\{%(_groupsre)s,?\s*"remoteAddr":""%(_groupsre)s,?\s*"message":"Trusted domain error. +datepattern = ,?\s*"time"\s*:\s*"%%Y-%%m-%%d[T ]%%H:%%M:%%S(%%z)?" diff --git a/conf/f2b_jail.conf b/conf/f2b_jail.conf new file mode 100644 index 00000000..4c63fc59 --- /dev/null +++ b/conf/f2b_jail.conf @@ -0,0 +1,6 @@ +[__APP__] +enabled = true +port = http,https +filter = __APP__ +logpath = /var/log/__APP__/nextcloud.log +maxretry = 5 diff --git a/scripts/install b/scripts/install index 361dc6bb..4207c31a 100755 --- a/scripts/install +++ b/scripts/install @@ -284,7 +284,7 @@ ynh_config_add_logrotate ynh_script_progression "Configuring Fail2Ban..." # Create a dedicated Fail2Ban config -ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" --failregex="^.*Login failed: .* \(Remote IP: .*$" +ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" #================================================= # CHECK IF NOTIFY_PUSH WORKS diff --git a/scripts/upgrade b/scripts/upgrade index 0ef66a91..5035a69b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -429,7 +429,7 @@ ynh_config_add_logrotate #================================================= # Create a dedicated Fail2Ban config -ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" --failregex="^.*Login failed: .* \(Remote IP: .*$" +ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" #================================================= # CHECK IF NOTIFY_PUSH WORKS From 9049d4738a86e4b09d8476cb5e8f3cde3595804d Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Feb 2025 19:06:21 +0100 Subject: [PATCH 032/185] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index a1f18b54..d7452e35 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description = Push daemon for Nextcloud clients +Description=Push daemon for Nextcloud clients [Service] Type=notify From 913ea56d78593051c158deb4f7c564767eb7adfc Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Feb 2025 19:08:10 +0100 Subject: [PATCH 033/185] Update DESCRIPTION_fr.md --- doc/DESCRIPTION_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 4300e3f4..a19201ad 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -2,6 +2,6 @@ Nextcloud permet de rendre accessible et de synchroniser ses données, fichiers, Dans le cadre de YunoHost, Nextcloud s'intègre avec le SSO/portail utilisateur (les comptes YunoHost sont automatiquements connectés à Nextcloud). -L'adresse `/.well-known` sera automatiquement configuré pour la synchronisation CalDAV et CardDAV si aucun autre service tel que Baïkal ne l'utilise déjà. +L'adresse `/.well-known` sera automatiquement configuré pour la synchronisation CalDAV et CardDAV si aucun autre service tel que Baïkal ne l'utilise déjà. Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. From 7d70d5658984fadb9d922382b277ac67106dda48 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 22 Feb 2025 19:08:14 +0100 Subject: [PATCH 034/185] Auto-update READMEs --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 10b3fc93..bab75c10 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Nextcloud permet de rendre accessible et de synchroniser ses données, fichiers, Dans le cadre de YunoHost, Nextcloud s'intègre avec le SSO/portail utilisateur (les comptes YunoHost sont automatiquements connectés à Nextcloud). -L'adresse `/.well-known` sera automatiquement configuré pour la synchronisation CalDAV et CardDAV si aucun autre service tel que Baïkal ne l'utilise déjà. +L'adresse `/.well-known` sera automatiquement configuré pour la synchronisation CalDAV et CardDAV si aucun autre service tel que Baïkal ne l'utilise déjà. Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. From 00e64f6e88c381670f237802c197d0df5bc1bcbf Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 27 Feb 2025 14:05:38 +0100 Subject: [PATCH 035/185] Update manifest.toml (#788) --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2f228443..6b38d87e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -116,7 +116,7 @@ ram.runtime = "512M" api.allowed = ["visitors", "all_users"] [resources.apt] - packages = "mariadb-server, imagemagick, libmagickcore-6.q16-6-extra, acl, tar, smbclient, at, redis-server, php8.3-fpm, php8.3-bz2, php8.3-imap, php8.3-gmp, php8.3-gd, php8.3-intl, php8.3-curl, php8.3-apcu, php8.3-redis, php8.3-ldap, php8.3-imagick, php8.3-zip, php8.3-mbstring, php8.3-xml, php8.3-mysql, php8.3-igbinary, php8.3-bcmath" + packages = "mariadb-server, imagemagick, libmagickcore-6.q16-6-extra, acl, tar, smbclient, at, redis-server, php8.3-fpm, php8.3-bz2, php8.3-imap, php8.3-gmp, php8.3-gd, php8.3-intl, php8.3-curl, php8.3-apcu, php8.3-redis, php8.3-ldap, php8.3-imagick, php8.3-zip, php8.3-mbstring, php8.3-xml, php8.3-mysql, php8.3-igbinary, php8.3-bcmath, php8.3-sqlite3" [resources.database] type = "mysql" From 6d3e6a12b4f989ad6a4e62ffc8e91a4e9e2e32c4 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 27 Feb 2025 14:06:19 +0100 Subject: [PATCH 036/185] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 6b38d87e..c1092c04 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 = "30.0.6~ynh2" +version = "30.0.6~ynh3" maintainers = ["kay0u"] From 8c11acfcbd2069b8b0eb5d0ae618e4266931c7ed Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 27 Feb 2025 14:06:23 +0100 Subject: [PATCH 037/185] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 6ee7e5fb..3ce29c52 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Shipped version:** 30.0.6~ynh2 +**Shipped version:** 30.0.6~ynh3 **Demo:** diff --git a/README_es.md b/README_es.md index ede697a7..a892e210 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión actual:** 30.0.6~ynh2 +**Versión actual:** 30.0.6~ynh3 **Demo:** diff --git a/README_eu.md b/README_eu.md index 1e8b8692..a10e8bdf 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Paketatutako bertsioa:** 30.0.6~ynh2 +**Paketatutako bertsioa:** 30.0.6~ynh3 **Demoa:** diff --git a/README_fr.md b/README_fr.md index bab75c10..6501769a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ L'adresse `/.well-known` sera automatiquement configuré pour la synchronisation Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. -**Version incluse :** 30.0.6~ynh2 +**Version incluse :** 30.0.6~ynh3 **Démo :** diff --git a/README_gl.md b/README_gl.md index 2aa8e477..7d2d5628 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión proporcionada:** 30.0.6~ynh2 +**Versión proporcionada:** 30.0.6~ynh3 **Demo:** diff --git a/README_id.md b/README_id.md index 5c43ec19..6990f145 100644 --- a/README_id.md +++ b/README_id.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versi terkirim:** 30.0.6~ynh2 +**Versi terkirim:** 30.0.6~ynh3 **Demo:** diff --git a/README_nl.md b/README_nl.md index 3448a610..726520d0 100644 --- a/README_nl.md +++ b/README_nl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Geleverde versie:** 30.0.6~ynh2 +**Geleverde versie:** 30.0.6~ynh3 **Demo:** diff --git a/README_pl.md b/README_pl.md index 4dacb323..25acf3b6 100644 --- a/README_pl.md +++ b/README_pl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Dostarczona wersja:** 30.0.6~ynh2 +**Dostarczona wersja:** 30.0.6~ynh3 **Demo:** diff --git a/README_ru.md b/README_ru.md index 1927610d..e95ce49c 100644 --- a/README_ru.md +++ b/README_ru.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Поставляемая версия:** 30.0.6~ynh2 +**Поставляемая версия:** 30.0.6~ynh3 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 86c17fa6..207b95a3 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**分发版本：** 30.0.6~ynh2 +**分发版本：** 30.0.6~ynh3 **演示：** From 1b748ea997dd3cd47f8824eb800ed2d36a75a6fb Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Thu, 27 Feb 2025 14:24:55 +0100 Subject: [PATCH 038/185] Update config: syntax for enable_forward_email was using the old 2.0 helper syntax instead of 2.1 --- scripts/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config b/scripts/config index a2939758..8ca65d57 100644 --- a/scripts/config +++ b/scripts/config @@ -131,11 +131,11 @@ set__enable_notify_push() { set__enable_forward_email() { if [ "$enable_forward_email" -eq "0" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "mail" - ynh_replace_string --match_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --replace_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --target_file="$install_dir/apps/user_ldap/lib/User/User.php" + ynh_replace --match="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --replace="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --file="$install_dir/apps/user_ldap/lib/User/User.php" ynh_store_file_checksum --file="$install_dir/apps/user_ldap/lib/User/User.php" elif [ "$enable_forward_email" -eq "1" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "maildrop" - ynh_replace_string --match_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --replace_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --target_file="$install_dir/apps/user_ldap/lib/User/User.php" + ynh_replace --match="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --replace="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --file="$install_dir/apps/user_ldap/lib/User/User.php" ynh_store_file_checksum --file="$install_dir/apps/user_ldap/lib/User/User.php" fi ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email" From 79c3223862efc25589f82a2a18e6956bc5e8e345 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Feb 2025 20:34:40 +0100 Subject: [PATCH 039/185] Update config typo helpers --- scripts/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config b/scripts/config index 8ca65d57..68acadc5 100644 --- a/scripts/config +++ b/scripts/config @@ -131,11 +131,11 @@ set__enable_notify_push() { set__enable_forward_email() { if [ "$enable_forward_email" -eq "0" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "mail" - ynh_replace --match="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --replace="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --file="$install_dir/apps/user_ldap/lib/User/User.php" + ynh_replace --match_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --replace_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --target_file="$install_dir/apps/user_ldap/lib/User/User.php" ynh_store_file_checksum --file="$install_dir/apps/user_ldap/lib/User/User.php" elif [ "$enable_forward_email" -eq "1" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "maildrop" - ynh_replace --match="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --replace="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --file="$install_dir/apps/user_ldap/lib/User/User.php" + ynh_replace --match_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --replace_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --target_file="$install_dir/apps/user_ldap/lib/User/User.php" ynh_store_file_checksum --file="$install_dir/apps/user_ldap/lib/User/User.php" fi ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email" From b8d178ad030b0804387e92966039f5c03a2f3f09 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Feb 2025 20:46:05 +0100 Subject: [PATCH 040/185] Update config helpers 2 typo --- scripts/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config b/scripts/config index 68acadc5..a2939758 100644 --- a/scripts/config +++ b/scripts/config @@ -131,11 +131,11 @@ set__enable_notify_push() { set__enable_forward_email() { if [ "$enable_forward_email" -eq "0" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "mail" - ynh_replace --match_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --replace_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --target_file="$install_dir/apps/user_ldap/lib/User/User.php" + ynh_replace_string --match_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --replace_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --target_file="$install_dir/apps/user_ldap/lib/User/User.php" ynh_store_file_checksum --file="$install_dir/apps/user_ldap/lib/User/User.php" elif [ "$enable_forward_email" -eq "1" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "maildrop" - ynh_replace --match_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --replace_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --target_file="$install_dir/apps/user_ldap/lib/User/User.php" + ynh_replace_string --match_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --replace_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --target_file="$install_dir/apps/user_ldap/lib/User/User.php" ynh_store_file_checksum --file="$install_dir/apps/user_ldap/lib/User/User.php" fi ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email" From ee5d1d1f20f8eaee8f1f75d5b4fca1b8e69df8c0 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 27 Feb 2025 21:08:10 +0100 Subject: [PATCH 041/185] Update config still helpers 2.1, sorry for the mistake --- scripts/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config b/scripts/config index a2939758..8ca65d57 100644 --- a/scripts/config +++ b/scripts/config @@ -131,11 +131,11 @@ set__enable_notify_push() { set__enable_forward_email() { if [ "$enable_forward_email" -eq "0" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "mail" - ynh_replace_string --match_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --replace_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --target_file="$install_dir/apps/user_ldap/lib/User/User.php" + ynh_replace --match="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --replace="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --file="$install_dir/apps/user_ldap/lib/User/User.php" ynh_store_file_checksum --file="$install_dir/apps/user_ldap/lib/User/User.php" elif [ "$enable_forward_email" -eq "1" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "maildrop" - ynh_replace_string --match_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --replace_string="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --target_file="$install_dir/apps/user_ldap/lib/User/User.php" + ynh_replace --match="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --replace="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --file="$install_dir/apps/user_ldap/lib/User/User.php" ynh_store_file_checksum --file="$install_dir/apps/user_ldap/lib/User/User.php" fi ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email" From 61840c48f1dcf9f556b6b267bd0858828433b264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Parisel?= Date: Thu, 13 Mar 2025 18:09:13 +0100 Subject: [PATCH 042/185] Removing argument --file to calls of ynh_store_file_checksum helper (#792) As the usage is `ynh_store_file_checksum /path/to/file` as stated on https://github.com/YunoHost/yunohost/blob/main/helpers/helpers.v2.1.d/backup#L225 --- scripts/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config b/scripts/config index 8ca65d57..46290b2e 100644 --- a/scripts/config +++ b/scripts/config @@ -132,11 +132,11 @@ set__enable_forward_email() { if [ "$enable_forward_email" -eq "0" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "mail" ynh_replace --match="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --replace="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --file="$install_dir/apps/user_ldap/lib/User/User.php" - ynh_store_file_checksum --file="$install_dir/apps/user_ldap/lib/User/User.php" + ynh_store_file_checksum "$install_dir/apps/user_ldap/lib/User/User.php" elif [ "$enable_forward_email" -eq "1" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "maildrop" ynh_replace --match="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --replace="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --file="$install_dir/apps/user_ldap/lib/User/User.php" - ynh_store_file_checksum --file="$install_dir/apps/user_ldap/lib/User/User.php" + ynh_store_file_checksum "$install_dir/apps/user_ldap/lib/User/User.php" fi ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email" } From a0a4e227291ec55d7dafb3120f2b34c74b8eafbf Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Mar 2025 19:23:51 +0100 Subject: [PATCH 043/185] 30.0.7 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index c1092c04..e09b86cb 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 = "30.0.6~ynh3" +version = "30.0.7~ynh1" maintainers = ["kay0u"] @@ -59,8 +59,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.6.tar.bz2' - sha256 = 'ac0e091be6920965dc0c82f149b632d6b5ade7adee84a7b3c8cfd847450a8ddc' + url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.7.tar.bz2' + sha256 = 'dc7231c832840683cb72c3d8a209da1444d55c13554a84eb9fae7a75f0c12506' [resources.sources.29] url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2' From b327d69b2ba6da199905d9c1bf25078317ced302 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Mar 2025 19:23:55 +0100 Subject: [PATCH 044/185] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 3ce29c52..5e368428 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Shipped version:** 30.0.6~ynh3 +**Shipped version:** 30.0.7~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index a892e210..9f0279b3 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión actual:** 30.0.6~ynh3 +**Versión actual:** 30.0.7~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index a10e8bdf..ca2badb3 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Paketatutako bertsioa:** 30.0.6~ynh3 +**Paketatutako bertsioa:** 30.0.7~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 6501769a..7d6571d9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ L'adresse `/.well-known` sera automatiquement configuré pour la synchronisation Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. -**Version incluse :** 30.0.6~ynh3 +**Version incluse :** 30.0.7~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 7d2d5628..9cac9057 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión proporcionada:** 30.0.6~ynh3 +**Versión proporcionada:** 30.0.7~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 6990f145..af4a5494 100644 --- a/README_id.md +++ b/README_id.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versi terkirim:** 30.0.6~ynh3 +**Versi terkirim:** 30.0.7~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index 726520d0..c8425868 100644 --- a/README_nl.md +++ b/README_nl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Geleverde versie:** 30.0.6~ynh3 +**Geleverde versie:** 30.0.7~ynh1 **Demo:** diff --git a/README_pl.md b/README_pl.md index 25acf3b6..273ff74a 100644 --- a/README_pl.md +++ b/README_pl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Dostarczona wersja:** 30.0.6~ynh3 +**Dostarczona wersja:** 30.0.7~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index e95ce49c..2ba55a10 100644 --- a/README_ru.md +++ b/README_ru.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Поставляемая версия:** 30.0.6~ynh3 +**Поставляемая версия:** 30.0.7~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 207b95a3..42b31249 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**分发版本：** 30.0.6~ynh3 +**分发版本：** 30.0.7~ynh1 **演示：** From 1556216148ca1aa51176788be1bf12cc9f3f7b57 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Mar 2025 19:35:05 +0100 Subject: [PATCH 045/185] Update remove --- scripts/remove | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/remove b/scripts/remove index ea4e0f9b..d107db1d 100755 --- a/scripts/remove +++ b/scripts/remove @@ -19,10 +19,10 @@ ynh_config_remove_phpfpm # Remove notify push if [ $enable_notify_push -eq 1 ]; then - ynh_config_remove_systemd"${app}-notify-push" + ynh_config_remove_systemd "${app}-notify-push" systemctl disable --now --quiet ${app}-notify-push-watcher.path ynh_safe_rm "/etc/systemd/system/${app}-notify-push-watcher.path" - ynh_config_remove_systemd"${app}-notify-push-watcher" + ynh_config_remove_systemd "${app}-notify-push-watcher" fi # Remove a cron file From b2075a80a82809bf355af1cc7bbe6c50cba58392 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Mar 2025 17:06:03 +0100 Subject: [PATCH 046/185] 30.0.8 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index e09b86cb..6bc183d4 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 = "30.0.7~ynh1" +version = "30.0.8~ynh1" maintainers = ["kay0u"] @@ -59,8 +59,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.7.tar.bz2' - sha256 = 'dc7231c832840683cb72c3d8a209da1444d55c13554a84eb9fae7a75f0c12506' + url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2' + sha256 = 'bb086a112fb3516e744921d7ae1482cc1bd537edfd1f14051c1348d4b6ad58a2' [resources.sources.29] url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2' From f64623a7bbd890f7ac1c75ab64da62937d6ca25f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 19 Mar 2025 17:06:08 +0100 Subject: [PATCH 047/185] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5e368428..00bb6d8c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Shipped version:** 30.0.7~ynh1 +**Shipped version:** 30.0.8~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 9f0279b3..c57f91fc 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión actual:** 30.0.7~ynh1 +**Versión actual:** 30.0.8~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index ca2badb3..de0b7eaf 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Paketatutako bertsioa:** 30.0.7~ynh1 +**Paketatutako bertsioa:** 30.0.8~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 7d6571d9..6e966e26 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ L'adresse `/.well-known` sera automatiquement configuré pour la synchronisation Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. -**Version incluse :** 30.0.7~ynh1 +**Version incluse :** 30.0.8~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 9cac9057..b3c1ca4d 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión proporcionada:** 30.0.7~ynh1 +**Versión proporcionada:** 30.0.8~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index af4a5494..ea32d19a 100644 --- a/README_id.md +++ b/README_id.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versi terkirim:** 30.0.7~ynh1 +**Versi terkirim:** 30.0.8~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index c8425868..7a584c57 100644 --- a/README_nl.md +++ b/README_nl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Geleverde versie:** 30.0.7~ynh1 +**Geleverde versie:** 30.0.8~ynh1 **Demo:** diff --git a/README_pl.md b/README_pl.md index 273ff74a..8d53191b 100644 --- a/README_pl.md +++ b/README_pl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Dostarczona wersja:** 30.0.7~ynh1 +**Dostarczona wersja:** 30.0.8~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index 2ba55a10..c1ab17e8 100644 --- a/README_ru.md +++ b/README_ru.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Поставляемая версия:** 30.0.7~ynh1 +**Поставляемая версия:** 30.0.8~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 42b31249..9c9c7e04 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**分发版本：** 30.0.7~ynh1 +**分发版本：** 30.0.8~ynh1 **演示：** From 39028e50c40d080a38107a5d2d44bac72ec33a74 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Mar 2025 07:50:42 +0100 Subject: [PATCH 048/185] 31.0.2 (#787) --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_nl.md | 2 +- README_pl.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- manifest.toml | 7 ++++++- scripts/config | 4 ---- tests.toml | 3 +-- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 00bb6d8c..7f4c4a8a 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Shipped version:** 30.0.8~ynh1 +**Shipped version:** 31.0.2~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index c57f91fc..1718a3c1 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión actual:** 30.0.8~ynh1 +**Versión actual:** 31.0.2~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index de0b7eaf..af81022a 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Paketatutako bertsioa:** 30.0.8~ynh1 +**Paketatutako bertsioa:** 31.0.2~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 6e966e26..74493276 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ L'adresse `/.well-known` sera automatiquement configuré pour la synchronisation Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. -**Version incluse :** 30.0.8~ynh1 +**Version incluse :** 31.0.2~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index b3c1ca4d..fd3adefd 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versión proporcionada:** 30.0.8~ynh1 +**Versión proporcionada:** 31.0.2~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index ea32d19a..36d8b177 100644 --- a/README_id.md +++ b/README_id.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Versi terkirim:** 30.0.8~ynh1 +**Versi terkirim:** 31.0.2~ynh1 **Demo:** diff --git a/README_nl.md b/README_nl.md index 7a584c57..1a62a0a2 100644 --- a/README_nl.md +++ b/README_nl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Geleverde versie:** 30.0.8~ynh1 +**Geleverde versie:** 31.0.2~ynh1 **Demo:** diff --git a/README_pl.md b/README_pl.md index 8d53191b..aec00d66 100644 --- a/README_pl.md +++ b/README_pl.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Dostarczona wersja:** 30.0.8~ynh1 +**Dostarczona wersja:** 31.0.2~ynh1 **Demo:** diff --git a/README_ru.md b/README_ru.md index c1ab17e8..d131f44a 100644 --- a/README_ru.md +++ b/README_ru.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**Поставляемая версия:** 30.0.8~ynh1 +**Поставляемая версия:** 31.0.2~ynh1 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 9c9c7e04..40b0ea2c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ The `/.well-known` address will be automatically configured for CalDAV and CardD The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. -**分发版本：** 30.0.8~ynh1 +**分发版本：** 31.0.2~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index 6bc183d4..9b2701c8 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 = "30.0.8~ynh1" +version = "31.0.2~ynh1" maintainers = ["kay0u"] @@ -59,8 +59,13 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] + url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2' + sha256 = '00b572111b7c2b98842d95c046de79ef463ccfadc8a04b54006c786e1f94c310' + + [resources.sources.30] url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2' sha256 = 'bb086a112fb3516e744921d7ae1482cc1bd537edfd1f14051c1348d4b6ad58a2' + prefetch = false [resources.sources.29] url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2' diff --git a/scripts/config b/scripts/config index 46290b2e..dbc4aaa4 100644 --- a/scripts/config +++ b/scripts/config @@ -131,12 +131,8 @@ set__enable_notify_push() { set__enable_forward_email() { if [ "$enable_forward_email" -eq "0" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "mail" - ynh_replace --match="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --replace="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --file="$install_dir/apps/user_ldap/lib/User/User.php" - ynh_store_file_checksum "$install_dir/apps/user_ldap/lib/User/User.php" elif [ "$enable_forward_email" -eq "1" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "maildrop" - ynh_replace --match="\$this->updateEmail(\$ldapEntry\[\$attr\]\[0\]);" --replace="\$this->updateEmail(\$ldapEntry\[\$attr\]\[1\]);" --file="$install_dir/apps/user_ldap/lib/User/User.php" - ynh_store_file_checksum "$install_dir/apps/user_ldap/lib/User/User.php" fi ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email" } diff --git a/tests.toml b/tests.toml index 3b5943a1..1106a08a 100644 --- a/tests.toml +++ b/tests.toml @@ -8,11 +8,10 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.c5cf91ad.name = "Upgrade from 25.0.2" - test_upgrade_from.caf917f3.name = "Upgrade from 26.0.2" test_upgrade_from.9c6d1eea.name = "Upgrade from 27.1.4" test_upgrade_from.e9f82ab7.name = "Upgrade from 28.0.6" test_upgrade_from.541f5fde.name = "Upgrade from 29.0.8" + test_upgrade_from.5bbe70c6.name = "Upgrade from 30.0.8" [default.curl_tests] #home.path = "/" From 73c5a62baa0889dc3c2e012d28090814b85deaca Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 11 Apr 2025 08:29:00 +0200 Subject: [PATCH 049/185] 31.0.3 (#795) * Auto-update READMEs * Update manifest.toml --------- Co-authored-by: yunohost-bot --- ALL_README.md | 12 --------- README.md | 69 ++++++++++++++++++----------------------------- README_es.md | 58 --------------------------------------- README_eu.md | 58 --------------------------------------- README_fr.md | 59 ---------------------------------------- README_gl.md | 58 --------------------------------------- README_id.md | 58 --------------------------------------- README_it.md | 61 ----------------------------------------- README_nl.md | 58 --------------------------------------- README_pl.md | 58 --------------------------------------- README_ru.md | 58 --------------------------------------- README_zh_Hans.md | 58 --------------------------------------- manifest.toml | 14 +++++----- 13 files changed, 33 insertions(+), 646 deletions(-) delete mode 100644 ALL_README.md delete mode 100644 README_es.md delete mode 100644 README_eu.md delete mode 100644 README_fr.md delete mode 100644 README_gl.md delete mode 100644 README_id.md delete mode 100644 README_it.md delete mode 100644 README_nl.md delete mode 100644 README_pl.md delete mode 100644 README_ru.md delete mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md deleted file mode 100644 index c93d6202..00000000 --- a/ALL_README.md +++ /dev/null @@ -1,12 +0,0 @@ -# All available README files by language - -- [Read the README in English](README.md) -- [Lea el README en español](README_es.md) -- [Irakurri README euskaraz](README_eu.md) -- [Lire le README en français](README_fr.md) -- [Le o README en galego](README_gl.md) -- [Baca README dalam bahasa bahasa Indonesia](README_id.md) -- [Lees de README in het Nederlands](README_nl.md) -- [Przeczytaj README w języku polski](README_pl.md) -- [Прочитать README на русский](README_ru.md) -- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 7f4c4a8a..094d7974 100644 --- a/README.md +++ b/README.md @@ -1,58 +1,41 @@ -# Nextcloud for YunoHost +

+ Logo of Nextcloud + Nextcloud, packaged for YunoHost +

-[![Integration level](https://apps.yunohost.org/badge/integration/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -![Working status](https://apps.yunohost.org/badge/state/nextcloud) -![Maintenance status](https://apps.yunohost.org/badge/maintained/nextcloud) +Online storage, file sharing platform and various other applications -[![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) +[![🌐 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.2~ynh1](https://img.shields.io/badge/Version-31.0.2~ynh1-rgba(0,150,0,1)?style=for-the-badge) -*[Read this README in other languages.](./ALL_README.md)* +
+ + +
-> *This package allows you to install Nextcloud quickly and simply on a YunoHost server.* -> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* +## 📦 Developer info -## Overview +[![Automatic tests level](https://apps.yunohost.org/badge/cilevel/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -Nextcloud lets you access and synchronize data, files, contacts and calendars between different devices (PCs or mobiles), or share them with other people (with or without accounts), and also offers advanced communication and collaborative working features. Nextcloud features its own application mechanism (see also [Nextcloud's app store](https://apps.nextcloud.com/)) for specific functionalities. +🛠️ Upstream Nextcloud repository: -In the context of YunoHost, Nextcloud integrates with the SSO/User Portal (YunoHost accounts are automatically connected to Nextcloud). +Pull request are welcome and should target the [`testing` branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). -The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it. - -The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. - -**Shipped version:** 31.0.2~ynh1 - -**Demo:** - -## Screenshots - -![Screenshot of Nextcloud](./doc/screenshots/screenshot.png) - -## Documentation and resources - -- Official app website: -- Official user documentation: -- Official admin documentation: -- Upstream app code repository: -- YunoHost Store: -- Report a bug: - -## Developer info - -Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). - -To try the `testing` branch, please proceed like that: +The `testing` branch can be tested using: +``` +# fresh install: +sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -or -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug +# upgrade an existing install: +sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing ``` -**More info regarding app packaging:** +### 📚 App packaging documentation + +Please see for more information. \ No newline at end of file diff --git a/README_es.md b/README_es.md deleted file mode 100644 index 1718a3c1..00000000 --- a/README_es.md +++ /dev/null @@ -1,58 +0,0 @@ - - -# Nextcloud para Yunohost - -[![Nivel de integración](https://apps.yunohost.org/badge/integration/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -![Estado funcional](https://apps.yunohost.org/badge/state/nextcloud) -![Estado En Mantención](https://apps.yunohost.org/badge/maintained/nextcloud) - -[![Instalar Nextcloud con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) - -*[Leer este README en otros idiomas.](./ALL_README.md)* - -> *Este paquete le permite instalarNextcloud rapidamente y simplement en un servidor YunoHost.* -> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* - -## Descripción general - -Nextcloud lets you access and synchronize data, files, contacts and calendars between different devices (PCs or mobiles), or share them with other people (with or without accounts), and also offers advanced communication and collaborative working features. Nextcloud features its own application mechanism (see also [Nextcloud's app store](https://apps.nextcloud.com/)) for specific functionalities. - -In the context of YunoHost, Nextcloud integrates with the SSO/User Portal (YunoHost accounts are automatically connected to Nextcloud). - -The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it. - -The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. - -**Versión actual:** 31.0.2~ynh1 - -**Demo:** - -## Capturas - -![Captura de Nextcloud](./doc/screenshots/screenshot.png) - -## Documentaciones y recursos - -- Sitio web oficial: -- Documentación usuario oficial: -- Documentación administrador oficial: -- Repositorio del código fuente oficial de la aplicación : -- Catálogo YunoHost: -- Reportar un error: - -## Información para desarrolladores - -Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). - -Para probar la rama `testing`, sigue asÍ: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -o -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -``` - -**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md deleted file mode 100644 index af81022a..00000000 --- a/README_eu.md +++ /dev/null @@ -1,58 +0,0 @@ - - -# Nextcloud YunoHost-erako - -[![Integrazio maila](https://apps.yunohost.org/badge/integration/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -![Funtzionamendu egoera](https://apps.yunohost.org/badge/state/nextcloud) -![Mantentze egoera](https://apps.yunohost.org/badge/maintained/nextcloud) - -[![Instalatu Nextcloud YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) - -*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* - -> *Pakete honek Nextcloud YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* -> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* - -## Aurreikuspena - -Nextcloud lets you access and synchronize data, files, contacts and calendars between different devices (PCs or mobiles), or share them with other people (with or without accounts), and also offers advanced communication and collaborative working features. Nextcloud features its own application mechanism (see also [Nextcloud's app store](https://apps.nextcloud.com/)) for specific functionalities. - -In the context of YunoHost, Nextcloud integrates with the SSO/User Portal (YunoHost accounts are automatically connected to Nextcloud). - -The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it. - -The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. - -**Paketatutako bertsioa:** 31.0.2~ynh1 - -**Demoa:** - -## Pantaila-argazkiak - -![Nextcloud(r)en pantaila-argazkia](./doc/screenshots/screenshot.png) - -## Dokumentazioa eta baliabideak - -- Aplikazioaren webgune ofiziala: -- Erabiltzaileen dokumentazio ofiziala: -- Administratzaileen dokumentazio ofiziala: -- Jatorrizko aplikazioaren kode-gordailua: -- YunoHost Denda: -- Eman errore baten berri: - -## Garatzaileentzako informazioa - -Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). - -`testing` abarra probatzeko, ondorengoa egin: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -edo -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -``` - -**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md deleted file mode 100644 index 74493276..00000000 --- a/README_fr.md +++ /dev/null @@ -1,59 +0,0 @@ - - -# Nextcloud pour YunoHost - -[![Niveau d’intégration](https://apps.yunohost.org/badge/integration/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -![Statut du fonctionnement](https://apps.yunohost.org/badge/state/nextcloud) -![Statut de maintenance](https://apps.yunohost.org/badge/maintained/nextcloud) - -[![Installer Nextcloud avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) - -*[Lire le README dans d'autres langues.](./ALL_README.md)* - -> *Ce package vous permet d’installer Nextcloud rapidement et simplement sur un serveur YunoHost.* -> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* - -## Vue d’ensemble - -Nextcloud permet de rendre accessible et de synchroniser ses données, fichiers, contacts, agendas entre différents appareils (ordinateurs ou mobiles), ou de les partager avec d'autres personnes (avec ou sans comptes), et propose également des fonctionnalités avancées de communication et de travail collaboratif. Nextcloud dispose de son propre mécanisme d'applications (voir aussi [le store d'apps de Nextcloud](https://apps.nextcloud.com/)) pour disposer des fonctionnalités spécifiques. - -Dans le cadre de YunoHost, Nextcloud s'intègre avec le SSO/portail utilisateur (les comptes YunoHost sont automatiquements connectés à Nextcloud). - -L'adresse `/.well-known` sera automatiquement configuré pour la synchronisation CalDAV et CardDAV si aucun autre service tel que Baïkal ne l'utilise déjà. - -Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. - - -**Version incluse :** 31.0.2~ynh1 - -**Démo :** - -## Captures d’écran - -![Capture d’écran de Nextcloud](./doc/screenshots/screenshot.png) - -## Documentations et ressources - -- Site officiel de l’app : -- Documentation officielle utilisateur : -- Documentation officielle de l’admin : -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : - -## Informations pour les développeurs - -Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). - -Pour essayer la branche `testing`, procédez comme suit : - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -ou -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -``` - -**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md deleted file mode 100644 index fd3adefd..00000000 --- a/README_gl.md +++ /dev/null @@ -1,58 +0,0 @@ - - -# Nextcloud para YunoHost - -[![Nivel de integración](https://apps.yunohost.org/badge/integration/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -![Estado de funcionamento](https://apps.yunohost.org/badge/state/nextcloud) -![Estado de mantemento](https://apps.yunohost.org/badge/maintained/nextcloud) - -[![Instalar Nextcloud con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) - -*[Le este README en outros idiomas.](./ALL_README.md)* - -> *Este paquete permíteche instalar Nextcloud de xeito rápido e doado nun servidor YunoHost.* -> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* - -## Vista xeral - -Nextcloud lets you access and synchronize data, files, contacts and calendars between different devices (PCs or mobiles), or share them with other people (with or without accounts), and also offers advanced communication and collaborative working features. Nextcloud features its own application mechanism (see also [Nextcloud's app store](https://apps.nextcloud.com/)) for specific functionalities. - -In the context of YunoHost, Nextcloud integrates with the SSO/User Portal (YunoHost accounts are automatically connected to Nextcloud). - -The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it. - -The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. - -**Versión proporcionada:** 31.0.2~ynh1 - -**Demo:** - -## Capturas de pantalla - -![Captura de pantalla de Nextcloud](./doc/screenshots/screenshot.png) - -## Documentación e recursos - -- Web oficial da app: -- Documentación oficial para usuarias: -- Documentación oficial para admin: -- Repositorio de orixe do código: -- Tenda YunoHost: -- Informar dun problema: - -## Info de desenvolvemento - -Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). - -Para probar a rama `testing`, procede deste xeito: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -ou -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -``` - -**Máis info sobre o empaquetado da app:** diff --git a/README_id.md b/README_id.md deleted file mode 100644 index 36d8b177..00000000 --- a/README_id.md +++ /dev/null @@ -1,58 +0,0 @@ - - -# Nextcloud untuk YunoHost - -[![Tingkat integrasi](https://apps.yunohost.org/badge/integration/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -![Status kerja](https://apps.yunohost.org/badge/state/nextcloud) -![Status pemeliharaan](https://apps.yunohost.org/badge/maintained/nextcloud) - -[![Pasang Nextcloud dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) - -*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* - -> *Paket ini memperbolehkan Anda untuk memasang Nextcloud secara cepat dan mudah pada server YunoHost.* -> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* - -## Ringkasan - -Nextcloud lets you access and synchronize data, files, contacts and calendars between different devices (PCs or mobiles), or share them with other people (with or without accounts), and also offers advanced communication and collaborative working features. Nextcloud features its own application mechanism (see also [Nextcloud's app store](https://apps.nextcloud.com/)) for specific functionalities. - -In the context of YunoHost, Nextcloud integrates with the SSO/User Portal (YunoHost accounts are automatically connected to Nextcloud). - -The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it. - -The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. - -**Versi terkirim:** 31.0.2~ynh1 - -**Demo:** - -## Tangkapan Layar - -![Tangkapan Layar pada Nextcloud](./doc/screenshots/screenshot.png) - -## Dokumentasi dan sumber daya - -- Website aplikasi resmi: -- Dokumentasi pengguna resmi: -- Dokumentasi admin resmi: -- Depot kode aplikasi hulu: -- Gudang YunoHost: -- Laporkan bug: - -## Info developer - -Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). - -Untuk mencoba branch `testing`, silakan dilanjutkan seperti: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -atau -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -``` - -**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_it.md b/README_it.md deleted file mode 100644 index d3fa6542..00000000 --- a/README_it.md +++ /dev/null @@ -1,61 +0,0 @@ - - -# Nextcloud per YunoHost - -[![Livello di integrazione](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg) - -[![Installa Nextcloud con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) - -*[Leggi questo README in altre lingue.](./ALL_README.md)* - -> *Questo pacchetto ti permette di installare Nextcloud su un server YunoHost in modo semplice e veloce.* -> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.* - -## Panoramica - -Nextcloud Hub is a fully open-source on-premises content collaboration platform. Teams access, share and edit their documents, chat and participate in video calls and manage their mail and calendar and projects across mobile, desktop and web interfaces. - -### YunoHost-specific features - -In addition to Nextcloud core features, the following are made available with this package: - - * Integrate with YunoHost users and SSO - i.e. logout button - * Allow one user to be the administrator (set at the installation) - * Allow multiple instances of this application - * Optionally access the user home folder from Nextcloud files (set at the installation, the sharing is enabled by default) - * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal - - -**Versione pubblicata:** 28.0.4~ynh1 - -**Prova:** - -## Screenshot - -![Screenshot di Nextcloud](./doc/screenshots/screenshot.png) - -## Documentazione e risorse - -- Sito web ufficiale dell’app: -- Documentazione ufficiale per gli utenti: -- Documentazione ufficiale per gli amministratori: -- Repository upstream del codice dell’app: -- Store di YunoHost: -- Segnala un problema: - -## Informazioni per sviluppatori - -Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). - -Per provare la branch di `testing`, si prega di procedere in questo modo: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -o -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -``` - -**Maggiori informazioni riguardo il pacchetto di quest’app:** diff --git a/README_nl.md b/README_nl.md deleted file mode 100644 index 1a62a0a2..00000000 --- a/README_nl.md +++ /dev/null @@ -1,58 +0,0 @@ - - -# Nextcloud voor Yunohost - -[![Integratieniveau](https://apps.yunohost.org/badge/integration/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -![Mate van functioneren](https://apps.yunohost.org/badge/state/nextcloud) -![Onderhoudsstatus](https://apps.yunohost.org/badge/maintained/nextcloud) - -[![Nextcloud met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) - -*[Deze README in een andere taal lezen.](./ALL_README.md)* - -> *Met dit pakket kun je Nextcloud snel en eenvoudig op een YunoHost-server installeren.* -> *Als je nog geen YunoHost hebt, lees dan [de installatiehandleiding](https://yunohost.org/install), om te zien hoe je 'm installeert.* - -## Overzicht - -Nextcloud lets you access and synchronize data, files, contacts and calendars between different devices (PCs or mobiles), or share them with other people (with or without accounts), and also offers advanced communication and collaborative working features. Nextcloud features its own application mechanism (see also [Nextcloud's app store](https://apps.nextcloud.com/)) for specific functionalities. - -In the context of YunoHost, Nextcloud integrates with the SSO/User Portal (YunoHost accounts are automatically connected to Nextcloud). - -The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it. - -The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. - -**Geleverde versie:** 31.0.2~ynh1 - -**Demo:** - -## Schermafdrukken - -![Schermafdrukken van Nextcloud](./doc/screenshots/screenshot.png) - -## Documentatie en bronnen - -- Officiele website van de app: -- Officiele gebruikersdocumentatie: -- Officiele beheerdersdocumentatie: -- Upstream app codedepot: -- YunoHost-store: -- Meld een bug: - -## Ontwikkelaarsinformatie - -Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). - -Om de `testing`-branch uit te proberen, ga als volgt te werk: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -of -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -``` - -**Verdere informatie over app-packaging:** diff --git a/README_pl.md b/README_pl.md deleted file mode 100644 index aec00d66..00000000 --- a/README_pl.md +++ /dev/null @@ -1,58 +0,0 @@ - - -# Nextcloud dla YunoHost - -[![Poziom integracji](https://apps.yunohost.org/badge/integration/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -![Status działania](https://apps.yunohost.org/badge/state/nextcloud) -![Status utrzymania](https://apps.yunohost.org/badge/maintained/nextcloud) - -[![Zainstaluj Nextcloud z YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) - -*[Przeczytaj plik README w innym języku.](./ALL_README.md)* - -> *Ta aplikacja pozwala na szybką i prostą instalację Nextcloud na serwerze YunoHost.* -> *Jeżeli nie masz YunoHost zapoznaj się z [poradnikiem](https://yunohost.org/install) instalacji.* - -## Przegląd - -Nextcloud lets you access and synchronize data, files, contacts and calendars between different devices (PCs or mobiles), or share them with other people (with or without accounts), and also offers advanced communication and collaborative working features. Nextcloud features its own application mechanism (see also [Nextcloud's app store](https://apps.nextcloud.com/)) for specific functionalities. - -In the context of YunoHost, Nextcloud integrates with the SSO/User Portal (YunoHost accounts are automatically connected to Nextcloud). - -The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it. - -The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. - -**Dostarczona wersja:** 31.0.2~ynh1 - -**Demo:** - -## Zrzuty ekranu - -![Zrzut ekranu z Nextcloud](./doc/screenshots/screenshot.png) - -## Dokumentacja i zasoby - -- Oficjalna strona aplikacji: -- Oficjalna dokumentacja: -- Oficjalna dokumentacja dla administratora: -- Repozytorium z kodem źródłowym: -- Sklep YunoHost: -- Zgłaszanie błędów: - -## Informacje od twórców - -Wyślij swój pull request do [gałęzi `testing`](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). - -Aby wypróbować gałąź `testing` postępuj zgodnie z instrukcjami: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -lub -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -``` - -**Więcej informacji o tworzeniu paczek aplikacji:** diff --git a/README_ru.md b/README_ru.md deleted file mode 100644 index d131f44a..00000000 --- a/README_ru.md +++ /dev/null @@ -1,58 +0,0 @@ - - -# Nextcloud для YunoHost - -[![Уровень интеграции](https://apps.yunohost.org/badge/integration/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -![Состояние работы](https://apps.yunohost.org/badge/state/nextcloud) -![Состояние сопровождения](https://apps.yunohost.org/badge/maintained/nextcloud) - -[![Установите Nextcloud с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) - -*[Прочтите этот README на других языках.](./ALL_README.md)* - -> *Этот пакет позволяет Вам установить Nextcloud быстро и просто на YunoHost-сервер.* -> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* - -## Обзор - -Nextcloud lets you access and synchronize data, files, contacts and calendars between different devices (PCs or mobiles), or share them with other people (with or without accounts), and also offers advanced communication and collaborative working features. Nextcloud features its own application mechanism (see also [Nextcloud's app store](https://apps.nextcloud.com/)) for specific functionalities. - -In the context of YunoHost, Nextcloud integrates with the SSO/User Portal (YunoHost accounts are automatically connected to Nextcloud). - -The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it. - -The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. - -**Поставляемая версия:** 31.0.2~ynh1 - -**Демо-версия:** - -## Снимки экрана - -![Снимок экрана Nextcloud](./doc/screenshots/screenshot.png) - -## Документация и ресурсы - -- Официальный веб-сайт приложения: -- Официальная документация пользователя: -- Официальная документация администратора: -- Репозиторий кода главной ветки приложения: -- Магазин YunoHost: -- Сообщите об ошибке: - -## Информация для разработчиков - -Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing). - -Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -или -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -``` - -**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md deleted file mode 100644 index 40b0ea2c..00000000 --- a/README_zh_Hans.md +++ /dev/null @@ -1,58 +0,0 @@ - - -# YunoHost 上的 Nextcloud - -[![集成程度](https://apps.yunohost.org/badge/integration/nextcloud)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) -![工作状态](https://apps.yunohost.org/badge/state/nextcloud) -![维护状态](https://apps.yunohost.org/badge/maintained/nextcloud) - -[![使用 YunoHost 安装 Nextcloud](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud) - -*[阅读此 README 的其它语言版本。](./ALL_README.md)* - -> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Nextcloud。* -> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* - -## 概况 - -Nextcloud lets you access and synchronize data, files, contacts and calendars between different devices (PCs or mobiles), or share them with other people (with or without accounts), and also offers advanced communication and collaborative working features. Nextcloud features its own application mechanism (see also [Nextcloud's app store](https://apps.nextcloud.com/)) for specific functionalities. - -In the context of YunoHost, Nextcloud integrates with the SSO/User Portal (YunoHost accounts are automatically connected to Nextcloud). - -The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it. - -The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. - -**分发版本：** 31.0.2~ynh1 - -**演示：** - -## 截图 - -![Nextcloud 的截图](./doc/screenshots/screenshot.png) - -## 文档与资源 - -- 官方应用网站： -- 官方用户文档： -- 官方管理文档： -- 上游应用代码库： -- YunoHost 商店： -- 报告 bug： - -## 开发者信息 - -请向 [`testing` 分支](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing) 发送拉取请求。 - -如要尝试 `testing` 分支，请这样操作： - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -或 -sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug -``` - -**有关应用打包的更多信息：** diff --git a/manifest.toml b/manifest.toml index 9b2701c8..f6ac5957 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 = "31.0.2~ynh1" +version = "31.0.3~ynh1" maintainers = ["kay0u"] @@ -59,17 +59,17 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2' - sha256 = '00b572111b7c2b98842d95c046de79ef463ccfadc8a04b54006c786e1f94c310' + url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2' + sha256 = '9283aebd8fda5ad739cda56f7cabaa835cc3bf98f79536c36dccd7309e2b305a' [resources.sources.30] - url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2' - sha256 = 'bb086a112fb3516e744921d7ae1482cc1bd537edfd1f14051c1348d4b6ad58a2' + url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2' + sha256 = '82458bd7086c082a87ad1f1495d923b89e2331109a8d95e8b00e639bbd0e1f16' prefetch = false [resources.sources.29] - url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.12.tar.bz2' - sha256 = 'c020354ff3e1d2087370f70e058fe171713636ba0f073a5194adbdff3c1cafc6' + url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2' + sha256 = '8aabc20c82d8c71264ee8c4099769a05bc3351628001de5a34702cc112817cc0' prefetch = false [resources.sources.28] From 2350f9a85a1791eb9a43d280265701fbed5b995e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Apr 2025 12:14:55 +0200 Subject: [PATCH 050/185] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index f6ac5957..6c5cb9cf 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 = "31.0.3~ynh1" +version = "31.0.4~ynh1" maintainers = ["kay0u"] @@ -59,8 +59,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2' - sha256 = '9283aebd8fda5ad739cda56f7cabaa835cc3bf98f79536c36dccd7309e2b305a' + url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.4.tar.bz2' + sha256 = 'a47541566d5c6ac6f63e4f617e27da295156da47daa2cd22eee3400fd2ad1251' [resources.sources.30] url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2' From a3d27dee42ccbd7147c1ac822a6aad775107a90d Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Apr 2025 12:19:28 +0200 Subject: [PATCH 051/185] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 6c5cb9cf..47baf611 100644 --- a/manifest.toml +++ b/manifest.toml @@ -63,13 +63,13 @@ ram.runtime = "512M" sha256 = 'a47541566d5c6ac6f63e4f617e27da295156da47daa2cd22eee3400fd2ad1251' [resources.sources.30] - url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2' - sha256 = '82458bd7086c082a87ad1f1495d923b89e2331109a8d95e8b00e639bbd0e1f16' + url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2' + sha256 = 'e3495d17c5f5c9164542d93f636d696acc8f38b60bec70cf1ad2e79c76d995ba' prefetch = false [resources.sources.29] - url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2' - sha256 = '8aabc20c82d8c71264ee8c4099769a05bc3351628001de5a34702cc112817cc0' + url = 'https://download.nextcloud.com/server/releases/nextcloud-29.0.16.tar.bz2' + sha256 = '499bf61ab19edcd4e542af86609243c5b4f440eb5bb06c2ba7da0c2faa525322' prefetch = false [resources.sources.28] From 46f6c077a9d2b2fa602c0783f34ad56c1de62f73 Mon Sep 17 00:00:00 2001 From: Gredin67 Date: Mon, 5 May 2025 11:21:09 +0200 Subject: [PATCH 052/185] add versions_ and trashbin_retention_obligation (#805) --- conf/config.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/config.json b/conf/config.json index e108e51e..0c8d92f4 100644 --- a/conf/config.json +++ b/conf/config.json @@ -1,5 +1,7 @@ { "system": { + "trashbin_retention_obligation": "auto, 30", + "versions_retention_obligation": "auto, 30", "updatechecker": false, "memcache.local": "\\OC\\Memcache\\APCu", "integrity.check.disabled": true, From 231034b0b4433b5ae560eb93a4415fbcf7c29c91 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 5 May 2025 11:21:12 +0200 Subject: [PATCH 053/185] Auto-update READMEs --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 094d7974..94c9dc96 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ It shall NOT be edited by hand. -->

- Logo of Nextcloud + Logo of Nextcloud Nextcloud, packaged for YunoHost

@@ -12,7 +12,7 @@ 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.2~ynh1](https://img.shields.io/badge/Version-31.0.2~ynh1-rgba(0,150,0,1)?style=for-the-badge) +[![Version: 31.0.4~ynh2](https://img.shields.io/badge/Version-31.0.4~ynh2-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 925c47ae0732631dfe499609b127a08f1b88184e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 15 May 2025 13:01:43 +0200 Subject: [PATCH 054/185] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 380bf621..78accc47 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 = "31.0.4~ynh2" +version = "31.0.5~ynh1" maintainers = ["kay0u"] @@ -59,8 +59,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.4.tar.bz2' - sha256 = 'a47541566d5c6ac6f63e4f617e27da295156da47daa2cd22eee3400fd2ad1251' + url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.5.tar.bz2' + sha256 = '2228b8f524dcd87f08a2a9281d41b04f5cb500b7624bc8c8e07b8e3039061503' [resources.sources.30] url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2' From 3f48ba21b0340d9c1e6e404fce084348975d52a8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 15 May 2025 13:01:48 +0200 Subject: [PATCH 055/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94c9dc96..28db46e9 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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.4~ynh2](https://img.shields.io/badge/Version-31.0.4~ynh2-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 31.0.5~ynh1](https://img.shields.io/badge/Version-31.0.5~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 7d73c27767f59db1d0c286a35782f3a7f3e2197a Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 15 May 2025 13:02:41 +0200 Subject: [PATCH 056/185] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 78accc47..aae216a9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -63,8 +63,8 @@ ram.runtime = "512M" sha256 = '2228b8f524dcd87f08a2a9281d41b04f5cb500b7624bc8c8e07b8e3039061503' [resources.sources.30] - url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2' - sha256 = 'e3495d17c5f5c9164542d93f636d696acc8f38b60bec70cf1ad2e79c76d995ba' + url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.11.tar.bz2' + sha256 = '5842772d5d712f105dc8f15d6788459e6144b836cc88a062c905370a2654377a' prefetch = false [resources.sources.29] From d770a9759328c666bc8284e6f253245f02d85ab2 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 28 May 2025 15:29:51 +0200 Subject: [PATCH 057/185] Improve documentation for user_home question (#808) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Testing (#806) * move function to common.sh (#764) * move function to common.sh * Update config * add default_phone_region * Update nginx.conf * Update install * Fix upgrade exploding when $app is nextcloud__2, __3 etc because the virtual apt/dpkg package is named with - and not _ (#767) * Update upgrade replace correct file for nextcloud--x-ynh-deps * Update upgrade correct syntax for the helpers * Bump package revision * Auto-update READMEs * Patch (#768) * remove inused patch with YNH 12 * reorder patch * Fix fail2ban failregex * 30.0.5 * Auto-update READMEs * Update restore * Update upgrade (#777) * Update upgrade * Update manifest.toml * Update manifest.toml * Update post_user_delete (#778) * Update upgrade (#779) * [fix] Remove eval JS patch cause yunohost tiles doesn't exists anymore * Update manifest.toml * Auto-update READMEs * cleaning * cleaning * Update remove * [enh] Allow login by mail (#783) * 30.0.6 * Auto-update READMEs * Update manifest.toml * Update manifest.toml * Auto-update READMEs * [enh] Create custom fail2ban conf, with datepattern and more regex to catch (#785) * Update systemd.service * Update DESCRIPTION_fr.md * Auto-update READMEs * Update manifest.toml (#788) * Update manifest.toml * Auto-update READMEs * Update config: syntax for enable_forward_email was using the old 2.0 helper syntax instead of 2.1 * Update config typo helpers * Update config helpers 2 typo * Update config still helpers 2.1, sorry for the mistake * Removing argument --file to calls of ynh_store_file_checksum helper (#792) As the usage is `ynh_store_file_checksum /path/to/file` as stated on https://github.com/YunoHost/yunohost/blob/main/helpers/helpers.v2.1.d/backup#L225 * 30.0.7 * Auto-update READMEs * Update remove * 30.0.8 * Auto-update READMEs * 31.0.2 (#787) * 31.0.3 (#795) * Auto-update READMEs * Update manifest.toml --------- Co-authored-by: yunohost-bot * Update manifest.toml * Update manifest.toml * add versions_ and trashbin_retention_obligation (#805) * Auto-update READMEs * Update manifest.toml * Auto-update READMEs * Update manifest.toml --------- Co-authored-by: Robles Rodolphe Co-authored-by: yunohost-bot Co-authored-by: loowiz Co-authored-by: ljf Co-authored-by: ljf (zamentur) Co-authored-by: Kayou Co-authored-by: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Co-authored-by: Jérémie Parisel Co-authored-by: Gredin67 * Explain better the user_home question Closes #154 --------- Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: Robles Rodolphe Co-authored-by: yunohost-bot Co-authored-by: loowiz Co-authored-by: ljf Co-authored-by: ljf (zamentur) Co-authored-by: Kayou Co-authored-by: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Co-authored-by: Jérémie Parisel Co-authored-by: Gredin67 --- manifest.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index aae216a9..8c3cdb00 100644 --- a/manifest.toml +++ b/manifest.toml @@ -49,8 +49,10 @@ ram.runtime = "512M" default = "visitors" [install.user_home] - ask.en = "Access the users home folder from Nextcloud" - ask.fr = "Accéder au dossier personnel des utilisateurs depuis Nextcloud" + ask.en = "Add the users' home directory in Nextcloud?" + ask.fr = "Ajouter le dossier personnel des utilisateurs à Nextcloud ?" + help.en = "If enabled, each `/home/$user` directory will be added to their respective user's Nextcloud." + help.fr = "Si activé, le dossier `/home/$user` de chaque compte lui sera ajouté dans Nextcloud." type = "boolean" default = false From 7bf1685e7cd2172715f6c23a060bc8690418463e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 12 Jun 2025 11:11:30 +0200 Subject: [PATCH 058/185] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8c3cdb00..04baf1c4 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 = "31.0.5~ynh1" +version = "31.0.6~ynh1" maintainers = ["kay0u"] @@ -61,8 +61,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.5.tar.bz2' - sha256 = '2228b8f524dcd87f08a2a9281d41b04f5cb500b7624bc8c8e07b8e3039061503' + 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.11.tar.bz2' From 45967cb03158f3b74ddbdacf155b4507649b67fc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 Jun 2025 11:11:37 +0200 Subject: [PATCH 059/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28db46e9..38cd81bd 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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.5~ynh1](https://img.shields.io/badge/Version-31.0.5~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![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/)
From 3f5ea5a8b762430da77dd0a85ab416dd1d185386 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 12 Jun 2025 11:34:11 +0200 Subject: [PATCH 060/185] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 04baf1c4..787ac04d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -65,8 +65,8 @@ ram.runtime = "512M" sha256 = 'a6abce1be84ae65090625895ee5796c6e631fd10cb17645ec4d73f7d9b372628' [resources.sources.30] - url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.11.tar.bz2' - sha256 = '5842772d5d712f105dc8f15d6788459e6144b836cc88a062c905370a2654377a' + url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.12.tar.bz2' + sha256 = '9e19b25f42273d4361218426b4762a766bee408cfa6aa8219f8c27f72095a7a8' prefetch = false [resources.sources.29] From 7615afed2bc1f5614974bdfcd38123325ee65652 Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 17 Jun 2025 11:24:14 +0200 Subject: [PATCH 061/185] change x to X, add --recursive, add a default acl for new elements (#722) --- hooks/post_user_create | 2 +- scripts/backup | 2 +- scripts/config | 4 ++++ scripts/install | 5 ++++- scripts/remove | 2 +- scripts/restore | 3 +-- scripts/upgrade | 3 +++ 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/hooks/post_user_create b/hooks/post_user_create index c6717efc..123de578 100644 --- 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/scripts/backup b/scripts/backup index 33c0c7f1..feb41380 100755 --- 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 index dbc4aaa4..9a356bed 100644 --- 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 diff --git a/scripts/install b/scripts/install index 4207c31a..15ed7678 100755 --- a/scripts/install +++ b/scripts/install @@ -153,7 +153,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 +210,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 index d107db1d..df1fe905 100755 --- 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 index c1499b34..dee9221c 100755 --- 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 index 5035a69b..7f2a3683 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -396,6 +396,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";; From e9cf2ec5fc50442fe390885d6ea2fe77195940e6 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Tue, 17 Jun 2025 12:49:52 +0200 Subject: [PATCH 062/185] Fix inconsistent php version during upgrade with occ (#815) --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7f2a3683..8d090973 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -208,16 +208,16 @@ do 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" - # 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 From 31bd51664368d85795d9640629ec45f5ff1e0b6f Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Tue, 17 Jun 2025 15:18:06 +0200 Subject: [PATCH 063/185] Manage oldstable version (#816) * Manage oldstable version (#714) * [enh] channel wording * [fix] Bad source_id and repeated lines * [fix] Why remove maintenance:repair ??? * [fix] Stay on oldstable if it was not on last major version * [fix] Patches on oldstable setup * [fix] Old helpers key * [enh] oldstable as the default version * [enh] Auto update after channel change --------- Co-authored-by: Kayou --- config_panel.toml | 14 +++ manifest.toml | 10 ++ patches/30/00-add-logout_url-conf.patch | 30 ++++++ scripts/config | 5 + scripts/install | 11 +- scripts/upgrade | 133 ++++++++++++++---------- tests.toml | 15 ++- 7 files changed, 158 insertions(+), 60 deletions(-) create mode 100644 patches/30/00-add-logout_url-conf.patch diff --git a/config_panel.toml b/config_panel.toml index 0d4f160d..a1ae38ce 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -25,6 +25,20 @@ name.fr = "Configuration de Nextcloud" help.en = "This action sets permissions for all data. Beware, this action can take up to several hours if users have a lot of data." help.fr = "Cette action définit les autorisations pour toutes les données. Attention, cette action peut prendre jusqu'à plusieurs heures si les utilisateurs ont beaucoup de données." + [main.version] + name.en = "Upgrade channel" + name.fr = "Canal de mise à jour" + + [main.version.version_to_follow] + ask.en = "Upgrade channel to use" + ask.fr = "Canal de mise à jour à utiliser" + type = "select" + choices.stable = "Stable channel: latest version" + choices.oldstable = "Oldstable channel (recommended): previous major version, useful if you need high stability)" + default = "stable" + help.en = "Caution: changing this settings triggers an upgrade of your app. Stable releases (latest Nextcloud version available) sometimes contain annoying bugs or regressions. Using the oldstable channel (one version behind the latest) during this period can be useful if you need high stability." + help.fr = "Attention: changer ce paramètres déclenche la mise à jour de l'app. Les versions stables (dernière version Nextcloud disponible) contiennent parfois des bugs ou des régressions gênants. Utiliser le canal oldstable (une version en retard sur la dernière) pendant cette période peut être utile si vous avez besoin d'une grande stabilité." + [main.addressbook] name.en = "Address book configuration" name.fr = "Configuration du carnet d'adresses" diff --git a/manifest.toml b/manifest.toml index 787ac04d..d387b8a8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,6 +56,16 @@ ram.runtime = "512M" type = "boolean" default = false + [install.version_to_follow] + ask.en = "Upgrade channel to use" + ask.fr = "Canal de mise à jour à utiliser" + help.en = "Stable releases (latest Nextcloud version available) sometimes contain annoying bugs or regressions. Using the oldstable channel (one version behind the latest) during this period can be useful if you need high stability." + help.fr = "Les versions stables (dernière version Nextcloud disponible) contiennent parfois des bugs ou des régressions gênants. Utiliser le canal oldstable (une version en retard sur la dernière) pendant cette période peut être utile si vous avez besoin d'une grande stabilité." + type = "select" + choices.stable = "Stable channel: latest version" + choices.oldstable = "Oldstable channel (recommended): previous major version, useful if you need high stability)" + default = "oldstable" + [resources] [resources.sources] diff --git a/patches/30/00-add-logout_url-conf.patch b/patches/30/00-add-logout_url-conf.patch new file mode 100644 index 00000000..8628b783 --- /dev/null +++ b/patches/30/00-add-logout_url-conf.patch @@ -0,0 +1,30 @@ +diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php +index d4d6a17db79..f587f805683 100644 +--- a/core/Controller/LoginController.php ++++ b/core/Controller/LoginController.php +@@ -75,15 +75,21 @@ class LoginController extends Controller { + #[FrontpageRoute(verb: 'GET', url: '/logout')] + public function logout() { + $loginToken = $this->request->getCookie('nc_token'); ++ $uuidUser = $this->userSession->getUser()->getUID(); ++ $isLdapUser = $this->config->getUserValue($uuidUser, 'user_ldap', 'uid'); + if (!is_null($loginToken)) { +- $this->config->deleteUserValue($this->userSession->getUser()->getUID(), 'login_token', $loginToken); ++ $this->config->deleteUserValue($uuidUser, 'login_token', $loginToken); + } + $this->userSession->logout(); + +- $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute( ++ $redirectUrl = $this->urlGenerator->linkToRouteAbsolute( + 'core.login.showLoginForm', +- ['clear' => true] // this param the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers +- )); ++ ['clear' => true] // this param the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers) ++ ); ++ if (!is_null($isLdapUser)) { ++ $redirectUrl = $this->config->getSystemValue('logout_url', $redirectUrl); ++ } ++ $response = new RedirectResponse($redirectUrl); + + $this->session->set('clearingExecutionContexts', '1'); + $this->session->close(); diff --git a/scripts/config b/scripts/config index 9a356bed..791b351b 100644 --- a/scripts/config +++ b/scripts/config @@ -140,7 +140,12 @@ set__enable_forward_email() { fi ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email" } +set__version_to_follow() { + ynh_app_setting_set --app=$app --key=version_to_follow --value="$version_to_follow" + ynh_print_info "Upgrading nextcloud, it may take some time..." + yunohost app upgrade $app --force +} #================================================= # SPECIFIC RUNNERS FOR TOML SHORT KEYS #================================================= diff --git a/scripts/install b/scripts/install index 15ed7678..e343cde1 100755 --- a/scripts/install +++ b/scripts/install @@ -34,7 +34,16 @@ ynh_mysql_db_shell <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE ut #================================================= ynh_script_progression "Setting up source files..." -ynh_setup_source --dest_dir="$install_dir" + +source_id="main" +if [ "$version_to_follow" == "oldstable" ]; then + last_version=$(ynh_read_manifest "resources.sources.main.url" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') + last_major_version=${last_version%%.*} + last_major_version=$(( $last_major_version - 1 )) + source_id="$last_major_version" +fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --source_id="$source_id" #================================================= # PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 8d090973..d61d6396 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,6 +41,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 @@ -125,9 +126,24 @@ 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 [ -z "${version_to_follow:-}" ] +then + version_to_follow=oldstable + if [[ "$last_major_version" == "$current_major_version" ]]; then + version_to_follow=stable + fi + ynh_app_setting_set --key=version_to_follow --value="$version_to_follow" +fi + +if [[ "$version_to_follow" == "oldstable" ]] +then + last_major_version=$(( $last_major_version - 1 )) + last_version=$(ynh_read_manifest "resources.sources.${last_major_version}.url" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') +fi + if [[ "$last_major_version" != "$current_major_version" ]] then installed_apps_not_compatible_with_future_version="$(list_installed_apps_not_compatible_with_future_version $last_major_version)" @@ -166,62 +182,71 @@ 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 - - # 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" +# Avoid to downgrade Nextcloud, if channel has changed from stable to oldstable. +if [[ "$current_major_version" -le "$last_major_version" ]]; then - # 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" - - # 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 + 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" + if [[ "$version_to_follow" != "oldstable" ]] + then + source_id="main" + fi + else + ynh_print_info "Upgrading to Nextcloud $next_major_version" + + # We don't apply patches if it's not the destination version + ynh_safe_rm "../patches/$source_id" + 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 diff --git a/tests.toml b/tests.toml index 1106a08a..9101ba07 100644 --- a/tests.toml +++ b/tests.toml @@ -2,6 +2,7 @@ test_format = 1.0 [default] + args.version_to_follow = "stable" args.enable_notify_push = "0" # ------------------------------- @@ -37,8 +38,12 @@ 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" +[oldstable] + args.version_to_follow = "oldstable" + 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" From 8b03102a1f55e307d6ae66d6ec709bbea52835cf Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 17 Jun 2025 15:37:00 +0200 Subject: [PATCH 064/185] [fix] Logout url missing --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d61d6396..1ed5bfbb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -306,7 +306,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 " From 2a799bc0461dba8299a744d1b637e2154174ddbb Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 17 Jun 2025 15:52:28 +0200 Subject: [PATCH 065/185] V2 postgresql (#597) --- doc/PRE_UPGRADE.md | 1 + doc/PRE_UPGRADE_fr.md | 1 + manifest.toml | 6 ++++-- scripts/backup | 6 +++--- scripts/install | 14 ++----------- scripts/remove | 1 - scripts/restore | 11 ++++++----- scripts/upgrade | 46 +++++++++++++++++++++++++++++++++---------- 8 files changed, 53 insertions(+), 33 deletions(-) create mode 100644 doc/PRE_UPGRADE.md create mode 100644 doc/PRE_UPGRADE_fr.md diff --git a/doc/PRE_UPGRADE.md b/doc/PRE_UPGRADE.md new file mode 100644 index 00000000..e8a5189b --- /dev/null +++ b/doc/PRE_UPGRADE.md @@ -0,0 +1 @@ +Before updating NextCloud, make sure that your applications are compatible with the Nextcloud version you are about to install. Also update all your applications installed in NextCloud before updating. diff --git a/doc/PRE_UPGRADE_fr.md b/doc/PRE_UPGRADE_fr.md new file mode 100644 index 00000000..22eb6827 --- /dev/null +++ b/doc/PRE_UPGRADE_fr.md @@ -0,0 +1 @@ +Avant de mettre à jour NextCloud, assurez-vous que vos applications sont compatibles avec la version de Nextcloud que vous êtes sur le point d'installer. Mettez également à jour l'ensemble de vos applications installées dans NextCloud avant d'effectuer la mise à jour. diff --git a/manifest.toml b/manifest.toml index d387b8a8..5aaee02f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -139,7 +139,7 @@ ram.runtime = "512M" "tar", "smbclient", "at", - "mariadb-server", + "postgresql", "redis-server", "php8.3-apcu", "php8.3-bcmath", @@ -155,6 +155,7 @@ ram.runtime = "512M" "php8.3-ldap", "php8.3-mbstring", "php8.3-mysql", + "php8.3-pgsql", "php8.3-redis", "php8.3-sqlite3", "php8.3-xml", @@ -170,4 +171,5 @@ ram.runtime = "512M" """ [resources.database] - type = "mysql" + type = "postgresql" + \ No newline at end of file diff --git a/scripts/backup b/scripts/backup index feb41380..3134150f 100755 --- a/scripts/backup +++ b/scripts/backup @@ -40,11 +40,11 @@ ynh_backup "/etc/cron.d/$app" ynh_backup "/var/log/$app" #================================================= -# BACKUP THE MYSQL DATABASE +# BACKUP THE POSTGRESQL DATABASE #================================================= -ynh_print_info "Backing up the MySQL database..." +ynh_print_info "Backing up the PostgreSQL database..." -ynh_mysql_dump_db > db.sql +ynh_psql_dump_db > db.sql #================================================= # BACKUP THE NOTIFY_PUSH APP diff --git a/scripts/install b/scripts/install index e343cde1..e145e8ac 100755 --- a/scripts/install +++ b/scripts/install @@ -22,13 +22,6 @@ ynh_app_setting_set --key=enable_notify_push --value=0 system_addressbook_exposed="0" ynh_app_setting_set --key=system_addressbook_exposed --value=0 -#================================================= -# CREATE A MYSQL DATABASE -#================================================= -ynh_script_progression "Migrate MySQL database to utf8..." - -ynh_mysql_db_shell <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -92,7 +85,7 @@ admin_password="$(ynh_string_random --length=6)" # Install Nextcloud using a temporary admin user exec_occ maintenance:install \ - --database "mysql" --database-name $db_name \ + --database "pgsql" --database-name $db_name \ --database-user $db_user --database-pass "$db_pwd" \ --admin-user "admin" --admin-pass "$admin_password" \ --data-dir "$data_dir/data" \ @@ -103,9 +96,6 @@ exec_occ maintenance:install \ #================================================= ynh_script_progression "Configuring $app..." -# Set the mysql.utf8mb4 config to true in config.php -exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true" - # move the logs from the data_dir to the standard /var/log exec_occ config:system:set logfile --value="/var/log/$app/nextcloud.log" @@ -192,7 +182,7 @@ exec_occ config:system:set overwrite.cli.url --value="https://${domain}${path}" #================================================= # Set the user as admin -ynh_mysql_db_shell <<< "INSERT INTO oc_group_user VALUES ('admin','$admin');" +ynh_psql_db_shell <<< "INSERT INTO oc_group_user VALUES ('admin','$admin');" # And delete admin user exec_occ user:delete admin diff --git a/scripts/remove b/scripts/remove index df1fe905..720d7bb8 100755 --- a/scripts/remove +++ b/scripts/remove @@ -26,7 +26,6 @@ if [ $enable_notify_push -eq 1 ]; then fi # Remove a cron file -# TODO: Ensure that cron job is not running (How !?) ynh_safe_rm "/etc/cron.d/$app" # Cleaning ACL in home directories diff --git a/scripts/restore b/scripts/restore index dee9221c..dea87036 100755 --- a/scripts/restore +++ b/scripts/restore @@ -18,11 +18,11 @@ ynh_script_progression "Restoring data directory..." ynh_restore "$data_dir" #================================================= -# RESTORE THE MYSQL DATABASE +# RESTORE THE POSTGRESQL DATABASE #================================================= -ynh_script_progression "Restoring the MySQL database..." +ynh_script_progression "Restoring the PostgreSQL database..." -ynh_mysql_db_shell < ./db.sql +ynh_psql_db_shell < ./db.sql #================================================= # RESTORE SYSTEM CONFIGURATIONS @@ -83,6 +83,7 @@ ynh_script_progression "Adding multimedia directories..." # Build YunoHost multimedia directories ynh_multimedia_build_main_dir + # Allow nextcloud to write into these directories ynh_multimedia_addaccess $app @@ -97,8 +98,8 @@ ynh_restore "/etc/fail2ban/filter.d/$app.conf" # Make sure a log file exists (mostly for CI tests) logfile="/var/log/$app/nextcloud.log" if [ ! -f "$logfile" ]; then - touch "$logfile" - chown "$app:" "$logfile" + touch "$logfile" + chown "$app:" "$logfile" fi ynh_systemctl --action=restart --service=fail2ban diff --git a/scripts/upgrade b/scripts/upgrade index 1ed5bfbb..992d8b64 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,6 +55,12 @@ filter_boring_occ_warnings() { sed -E 's@\s*([0-9]+\/[0-9]+\s+\[(-|>|=)+\]\s+[0-9]+%|\s*Starting ...|Nextcloud or one of the apps require upgrade - only a limited number of commands are available|You may use your browser or the occ upgrade command to do the upgrade)@@g' } +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_major_version=${last_version%%.*} + # Define a function to execute commands with `occ` exec_occ() { # Backward compatibility to upgrade from older versions @@ -88,6 +94,35 @@ exec_occ() { php$NEXTCLOUD_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@") 2> >(filter_boring_occ_warnings >&2) } +#================================================= +# HANDLE DATABASE MIGRATION FROM MYSL TO PSQL +#================================================= + +# If we're moving through version 31.0.4~ynh2 (in which the switch to PostgreSQL is made) +if ynh_app_upgrading_from_version_before 31.0.4~ynh2 +then + # Double-check the MySQL database is here + if ! mysql -e "USE $db_name" 2>/dev/null + then + ynh_print_warn "Uhoh? The Nextcloud MySQL database doesn't exist? We are supposed to move it to PostgreSQL... Maybe it was already migrated?" + # Double check the psql is not empty, otherwise big whoops? + if [[ "$(ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null | wc -l 2>/dev/null | wc -l)" == 0 ]] + then + ynh_die "Apparently the PostgreSQL database is also empty, this is kind of worrying, what happened?!" + else + ynh_print_warn "Apparently the PostgreSQL database is not empty, so this is probably OK?" + fi + else + ynh_print_info "Migrating to PostgreSQL database..." + exec_occ db:convert-type --all-apps --clear-schema pgsql $db_name 127.0.0.1 $db_name --password=$db_pwd -n + ynh_mysql_drop_db $db_name + fi +fi + +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= + # Define a function to add an external storage # Create the external storage for the given folders and enable sharing create_external_storage() { @@ -163,15 +198,6 @@ chown -R $app:www-data "$install_dir" # Print the current version number of Nextcloud exec_occ -V -if [ "$(exec_occ config:system:get mysql.utf8mb4)" != "true" ]; then - db_pwd=$(ynh_app_setting_get --key=db_pwd) - # Change your databases character set and collation - ynh_mysql_db_shell <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" - # Set the mysql.utf8mb4 config to true in config.php - exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true" - exec_occ maintenance:repair -fi - # Upgrade may fail if this app is enabled # Take all apps enabled, and check if mail is one of them # Then temporary disable the mail app @@ -247,6 +273,7 @@ if [[ "$current_major_version" -le "$last_major_version" ]]; then 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 @@ -403,7 +430,6 @@ then ynh_config_add --template="notify_push.conf" --destination="$nginx_extra_conf_dir/notify_push.conf" fi -# Create a dedicated NGINX config ynh_config_add_nginx #================================================= From 8974b2476d86aae7f5960af113cfde5c827c6215 Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 17 Jun 2025 18:50:04 +0200 Subject: [PATCH 066/185] [fix] Upgrade with oldstable --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 1ed5bfbb..e1a8a3e8 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -141,7 +141,7 @@ fi if [[ "$version_to_follow" == "oldstable" ]] then last_major_version=$(( $last_major_version - 1 )) - last_version=$(ynh_read_manifest "resources.sources.${last_major_version}.url" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') + last_version=$(ynh_read_manifest 'resources.sources["'${last_major_version}'"].url' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') fi if [[ "$last_major_version" != "$current_major_version" ]] From 9e79535e00a91de37eb09fff4021266e45b5d5cb Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 17 Jun 2025 19:07:40 +0200 Subject: [PATCH 067/185] [enh] Use php8.3-fpm for olstable - 30 version --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e1a8a3e8..f25e5deb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,7 +58,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 ] From 4014098619810ba3e69342c5878f87a50e563ef7 Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 17 Jun 2025 18:50:04 +0200 Subject: [PATCH 068/185] [fix] Upgrade with oldstable --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 992d8b64..e3420aa6 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -176,7 +176,7 @@ fi if [[ "$version_to_follow" == "oldstable" ]] then last_major_version=$(( $last_major_version - 1 )) - last_version=$(ynh_read_manifest "resources.sources.${last_major_version}.url" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') + last_version=$(ynh_read_manifest 'resources.sources["'${last_major_version}'"].url' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') fi if [[ "$last_major_version" != "$current_major_version" ]] From 46b1a777d7386fb94d55cce6a9412d0da7370613 Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 17 Jun 2025 19:07:40 +0200 Subject: [PATCH 069/185] [enh] Use php8.3-fpm for olstable - 30 version --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e3420aa6..5353bd53 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,7 +64,7 @@ last_major_version=${last_version%%.*} # 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 ] From 8904b9a78ca071bd8305d33875f4323171a05252 Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 18 Jun 2025 09:43:58 +0200 Subject: [PATCH 070/185] [fix] Remove oldstable features --- config_panel.toml | 10 ---------- manifest.toml | 10 ---------- scripts/install | 10 +--------- scripts/upgrade | 23 +---------------------- 4 files changed, 2 insertions(+), 51 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index a1ae38ce..352b0a69 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -29,16 +29,6 @@ name.fr = "Configuration de Nextcloud" name.en = "Upgrade channel" name.fr = "Canal de mise à jour" - [main.version.version_to_follow] - ask.en = "Upgrade channel to use" - ask.fr = "Canal de mise à jour à utiliser" - type = "select" - choices.stable = "Stable channel: latest version" - choices.oldstable = "Oldstable channel (recommended): previous major version, useful if you need high stability)" - default = "stable" - help.en = "Caution: changing this settings triggers an upgrade of your app. Stable releases (latest Nextcloud version available) sometimes contain annoying bugs or regressions. Using the oldstable channel (one version behind the latest) during this period can be useful if you need high stability." - help.fr = "Attention: changer ce paramètres déclenche la mise à jour de l'app. Les versions stables (dernière version Nextcloud disponible) contiennent parfois des bugs ou des régressions gênants. Utiliser le canal oldstable (une version en retard sur la dernière) pendant cette période peut être utile si vous avez besoin d'une grande stabilité." - [main.addressbook] name.en = "Address book configuration" name.fr = "Configuration du carnet d'adresses" diff --git a/manifest.toml b/manifest.toml index d387b8a8..e1545740 100644 --- a/manifest.toml +++ b/manifest.toml @@ -55,16 +55,6 @@ ram.runtime = "512M" help.fr = "Si activé, le dossier `/home/$user` de chaque compte lui sera ajouté dans Nextcloud." type = "boolean" default = false - - [install.version_to_follow] - ask.en = "Upgrade channel to use" - ask.fr = "Canal de mise à jour à utiliser" - help.en = "Stable releases (latest Nextcloud version available) sometimes contain annoying bugs or regressions. Using the oldstable channel (one version behind the latest) during this period can be useful if you need high stability." - help.fr = "Les versions stables (dernière version Nextcloud disponible) contiennent parfois des bugs ou des régressions gênants. Utiliser le canal oldstable (une version en retard sur la dernière) pendant cette période peut être utile si vous avez besoin d'une grande stabilité." - type = "select" - choices.stable = "Stable channel: latest version" - choices.oldstable = "Oldstable channel (recommended): previous major version, useful if you need high stability)" - default = "oldstable" [resources] diff --git a/scripts/install b/scripts/install index e343cde1..94177eca 100755 --- a/scripts/install +++ b/scripts/install @@ -34,16 +34,8 @@ ynh_mysql_db_shell <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE ut #================================================= ynh_script_progression "Setting up source files..." - -source_id="main" -if [ "$version_to_follow" == "oldstable" ]; then - last_version=$(ynh_read_manifest "resources.sources.main.url" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') - last_major_version=${last_version%%.*} - last_major_version=$(( $last_major_version - 1 )) - source_id="$last_major_version" -fi # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" --source_id="$source_id" +ynh_setup_source --dest_dir="$install_dir" #================================================= # PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index f25e5deb..4d21dce8 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -129,21 +129,6 @@ current_major_version=${current_version%%.*} last_version=$(ynh_read_manifest "resources.sources.main.url" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') last_major_version=${last_version%%.*} -if [ -z "${version_to_follow:-}" ] -then - version_to_follow=oldstable - if [[ "$last_major_version" == "$current_major_version" ]]; then - version_to_follow=stable - fi - ynh_app_setting_set --key=version_to_follow --value="$version_to_follow" -fi - -if [[ "$version_to_follow" == "oldstable" ]] -then - last_major_version=$(( $last_major_version - 1 )) - last_version=$(ynh_read_manifest 'resources.sources["'${last_major_version}'"].url' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') -fi - if [[ "$last_major_version" != "$current_major_version" ]] then installed_apps_not_compatible_with_future_version="$(list_installed_apps_not_compatible_with_future_version $last_major_version)" @@ -193,15 +178,9 @@ if [[ "$current_major_version" -le "$last_major_version" ]]; then source_id="$next_major_version" if [[ "$next_major_version" -ge "$last_major_version" ]]; then ynh_print_info "Upgrading to Nextcloud $last_version" - if [[ "$version_to_follow" != "oldstable" ]] - then - source_id="main" - fi + source_id="main" else ynh_print_info "Upgrading to Nextcloud $next_major_version" - - # We don't apply patches if it's not the destination version - ynh_safe_rm "../patches/$source_id" fi # Create a temporary directory From 0a48eada4522fe7ac227ed260af749aea111c7b4 Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 18 Jun 2025 09:45:23 +0200 Subject: [PATCH 071/185] [fix] Remove oldstable from tests --- tests.toml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests.toml b/tests.toml index 9101ba07..7b873341 100644 --- a/tests.toml +++ b/tests.toml @@ -2,7 +2,6 @@ test_format = 1.0 [default] - args.version_to_follow = "stable" args.enable_notify_push = "0" # ------------------------------- @@ -38,11 +37,6 @@ test_format = 1.0 caldav.logged_on_sso = true caldav.expect_content = "This is the WebDAV interface." -[oldstable] - args.version_to_follow = "oldstable" - 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" From 117f66365a17aad1d4b53f983319a5e97b47af14 Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 18 Jun 2025 09:53:58 +0200 Subject: [PATCH 072/185] [fix] Dead code --- scripts/config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/config b/scripts/config index 791b351b..f2f19d89 100644 --- a/scripts/config +++ b/scripts/config @@ -140,12 +140,6 @@ set__enable_forward_email() { fi ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email" } -set__version_to_follow() { - ynh_app_setting_set --app=$app --key=version_to_follow --value="$version_to_follow" - ynh_print_info "Upgrading nextcloud, it may take some time..." - yunohost app upgrade $app --force - -} #================================================= # SPECIFIC RUNNERS FOR TOML SHORT KEYS #================================================= From 8c7973f04ecd15dc0182b59f225fbd37151cc043 Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 18 Jun 2025 09:55:55 +0200 Subject: [PATCH 073/185] [fix] Dead code --- config_panel.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index 352b0a69..0d4f160d 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -25,10 +25,6 @@ name.fr = "Configuration de Nextcloud" help.en = "This action sets permissions for all data. Beware, this action can take up to several hours if users have a lot of data." help.fr = "Cette action définit les autorisations pour toutes les données. Attention, cette action peut prendre jusqu'à plusieurs heures si les utilisateurs ont beaucoup de données." - [main.version] - name.en = "Upgrade channel" - name.fr = "Canal de mise à jour" - [main.addressbook] name.en = "Address book configuration" name.fr = "Configuration du carnet d'adresses" From 5c807f93f8ecf450911b0f605904864a6ec8055c Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 18 Jun 2025 09:43:58 +0200 Subject: [PATCH 074/185] [fix] Remove oldstable features --- config_panel.toml | 10 ---------- manifest.toml | 10 ---------- scripts/install | 10 +--------- scripts/upgrade | 23 +---------------------- 4 files changed, 2 insertions(+), 51 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index a1ae38ce..352b0a69 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -29,16 +29,6 @@ name.fr = "Configuration de Nextcloud" name.en = "Upgrade channel" name.fr = "Canal de mise à jour" - [main.version.version_to_follow] - ask.en = "Upgrade channel to use" - ask.fr = "Canal de mise à jour à utiliser" - type = "select" - choices.stable = "Stable channel: latest version" - choices.oldstable = "Oldstable channel (recommended): previous major version, useful if you need high stability)" - default = "stable" - help.en = "Caution: changing this settings triggers an upgrade of your app. Stable releases (latest Nextcloud version available) sometimes contain annoying bugs or regressions. Using the oldstable channel (one version behind the latest) during this period can be useful if you need high stability." - help.fr = "Attention: changer ce paramètres déclenche la mise à jour de l'app. Les versions stables (dernière version Nextcloud disponible) contiennent parfois des bugs ou des régressions gênants. Utiliser le canal oldstable (une version en retard sur la dernière) pendant cette période peut être utile si vous avez besoin d'une grande stabilité." - [main.addressbook] name.en = "Address book configuration" name.fr = "Configuration du carnet d'adresses" diff --git a/manifest.toml b/manifest.toml index 5aaee02f..5fe54b91 100644 --- a/manifest.toml +++ b/manifest.toml @@ -55,16 +55,6 @@ ram.runtime = "512M" help.fr = "Si activé, le dossier `/home/$user` de chaque compte lui sera ajouté dans Nextcloud." type = "boolean" default = false - - [install.version_to_follow] - ask.en = "Upgrade channel to use" - ask.fr = "Canal de mise à jour à utiliser" - help.en = "Stable releases (latest Nextcloud version available) sometimes contain annoying bugs or regressions. Using the oldstable channel (one version behind the latest) during this period can be useful if you need high stability." - help.fr = "Les versions stables (dernière version Nextcloud disponible) contiennent parfois des bugs ou des régressions gênants. Utiliser le canal oldstable (une version en retard sur la dernière) pendant cette période peut être utile si vous avez besoin d'une grande stabilité." - type = "select" - choices.stable = "Stable channel: latest version" - choices.oldstable = "Oldstable channel (recommended): previous major version, useful if you need high stability)" - default = "oldstable" [resources] diff --git a/scripts/install b/scripts/install index e145e8ac..7a3fb3f3 100755 --- a/scripts/install +++ b/scripts/install @@ -27,16 +27,8 @@ ynh_app_setting_set --key=system_addressbook_exposed --value=0 #================================================= ynh_script_progression "Setting up source files..." - -source_id="main" -if [ "$version_to_follow" == "oldstable" ]; then - last_version=$(ynh_read_manifest "resources.sources.main.url" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') - last_major_version=${last_version%%.*} - last_major_version=$(( $last_major_version - 1 )) - source_id="$last_major_version" -fi # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" --source_id="$source_id" +ynh_setup_source --dest_dir="$install_dir" #================================================= # PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 5353bd53..af436acb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -164,21 +164,6 @@ current_major_version=${current_version%%.*} last_version=$(ynh_read_manifest "resources.sources.main.url" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') last_major_version=${last_version%%.*} -if [ -z "${version_to_follow:-}" ] -then - version_to_follow=oldstable - if [[ "$last_major_version" == "$current_major_version" ]]; then - version_to_follow=stable - fi - ynh_app_setting_set --key=version_to_follow --value="$version_to_follow" -fi - -if [[ "$version_to_follow" == "oldstable" ]] -then - last_major_version=$(( $last_major_version - 1 )) - last_version=$(ynh_read_manifest 'resources.sources["'${last_major_version}'"].url' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') -fi - if [[ "$last_major_version" != "$current_major_version" ]] then installed_apps_not_compatible_with_future_version="$(list_installed_apps_not_compatible_with_future_version $last_major_version)" @@ -219,15 +204,9 @@ if [[ "$current_major_version" -le "$last_major_version" ]]; then source_id="$next_major_version" if [[ "$next_major_version" -ge "$last_major_version" ]]; then ynh_print_info "Upgrading to Nextcloud $last_version" - if [[ "$version_to_follow" != "oldstable" ]] - then - source_id="main" - fi + source_id="main" else ynh_print_info "Upgrading to Nextcloud $next_major_version" - - # We don't apply patches if it's not the destination version - ynh_safe_rm "../patches/$source_id" fi # Create a temporary directory From a183c2d7d5ba3fa51c5d4b5ff5102f05adfc8f7b Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 18 Jun 2025 09:45:23 +0200 Subject: [PATCH 075/185] [fix] Remove oldstable from tests --- tests.toml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests.toml b/tests.toml index 9101ba07..7b873341 100644 --- a/tests.toml +++ b/tests.toml @@ -2,7 +2,6 @@ test_format = 1.0 [default] - args.version_to_follow = "stable" args.enable_notify_push = "0" # ------------------------------- @@ -38,11 +37,6 @@ test_format = 1.0 caldav.logged_on_sso = true caldav.expect_content = "This is the WebDAV interface." -[oldstable] - args.version_to_follow = "oldstable" - 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" From 87362993a7f9dca0838cca009570be8d6c30894b Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 18 Jun 2025 09:53:58 +0200 Subject: [PATCH 076/185] [fix] Dead code --- scripts/config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/config b/scripts/config index 791b351b..f2f19d89 100644 --- a/scripts/config +++ b/scripts/config @@ -140,12 +140,6 @@ set__enable_forward_email() { fi ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email" } -set__version_to_follow() { - ynh_app_setting_set --app=$app --key=version_to_follow --value="$version_to_follow" - ynh_print_info "Upgrading nextcloud, it may take some time..." - yunohost app upgrade $app --force - -} #================================================= # SPECIFIC RUNNERS FOR TOML SHORT KEYS #================================================= From 3908d6139c61aa2798fdcf888e07ee7e4fc74007 Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 18 Jun 2025 09:55:55 +0200 Subject: [PATCH 077/185] [fix] Dead code --- config_panel.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index 352b0a69..0d4f160d 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -25,10 +25,6 @@ name.fr = "Configuration de Nextcloud" help.en = "This action sets permissions for all data. Beware, this action can take up to several hours if users have a lot of data." help.fr = "Cette action définit les autorisations pour toutes les données. Attention, cette action peut prendre jusqu'à plusieurs heures si les utilisateurs ont beaucoup de données." - [main.version] - name.en = "Upgrade channel" - name.fr = "Canal de mise à jour" - [main.addressbook] name.en = "Address book configuration" name.fr = "Configuration du carnet d'adresses" From fe7f562d6c4e26d87cd2a38bb6e1aaa566770648 Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 18 Jun 2025 00:30:22 +0200 Subject: [PATCH 078/185] [wip] DB migration --- manifest.toml | 3 ++- scripts/upgrade | 22 +++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5fe54b91..09beb17a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -130,6 +130,7 @@ ram.runtime = "512M" "smbclient", "at", "postgresql", + "mariadb-server", "redis-server", "php8.3-apcu", "php8.3-bcmath", @@ -162,4 +163,4 @@ ram.runtime = "512M" [resources.database] type = "postgresql" - \ No newline at end of file + diff --git a/scripts/upgrade b/scripts/upgrade index af436acb..6eb02c7e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,23 +98,19 @@ exec_occ() { # HANDLE DATABASE MIGRATION FROM MYSL TO PSQL #================================================= -# If we're moving through version 31.0.4~ynh2 (in which the switch to PostgreSQL is made) -if ynh_app_upgrading_from_version_before 31.0.4~ynh2 +# If the MySQL database is here, we should migrate +if mysql -e "USE $db_name" 2>/dev/null then - # Double-check the MySQL database is here - if ! mysql -e "USE $db_name" 2>/dev/null + # Migrate mysql db onto postgresql if the db is empty + if [[ "$(ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null | wc -l 2>/dev/null | wc -l)" == "0" ]] then - ynh_print_warn "Uhoh? The Nextcloud MySQL database doesn't exist? We are supposed to move it to PostgreSQL... Maybe it was already migrated?" - # Double check the psql is not empty, otherwise big whoops? - if [[ "$(ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null | wc -l 2>/dev/null | wc -l)" == 0 ]] - then - ynh_die "Apparently the PostgreSQL database is also empty, this is kind of worrying, what happened?!" - else - ynh_print_warn "Apparently the PostgreSQL database is not empty, so this is probably OK?" - fi - else ynh_print_info "Migrating to PostgreSQL database..." exec_occ db:convert-type --all-apps --clear-schema pgsql $db_name 127.0.0.1 $db_name --password=$db_pwd -n + fi + + # Remove mysql db if the postgresql db is not empty + if [[ "$(ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null | wc -l 2>/dev/null | wc -l)" != "0" ]] + then ynh_mysql_drop_db $db_name fi fi From 2528d02fec332d5a82b1c72b5640e721fcd366b3 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 19 Jun 2025 12:49:20 +0200 Subject: [PATCH 079/185] [fix] Upgrade remove executable perm for nc extension --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 4d21dce8..4020d0f2 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -335,6 +335,7 @@ ynh_script_progression "Reapplying file permissions..." chown -R $app:www-data "$install_dir" find $install_dir/ -type f -print0 | xargs -r0 chmod 0644 find $install_dir/ -type d -print0 | xargs -r0 chmod 0755 +find "$install_dir/apps/"*/{bin,bin-ext} -type d -print0 | xargs -r0 chmod -R u+x chmod 600 "$install_dir/config/config.php" chmod 755 /home/yunohost.app chmod 750 $install_dir From b2d77dbd2ceb56152ff0038b1413c4f52993264a Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 19 Jun 2025 12:49:20 +0200 Subject: [PATCH 080/185] [fix] Upgrade remove executable perm for nc extension --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 6eb02c7e..245b8aa6 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -358,6 +358,7 @@ ynh_script_progression "Reapplying file permissions..." chown -R $app:www-data "$install_dir" find $install_dir/ -type f -print0 | xargs -r0 chmod 0644 find $install_dir/ -type d -print0 | xargs -r0 chmod 0755 +find "$install_dir/apps/"*/{bin,bin-ext} -type d -print0 | xargs -r0 chmod -R u+x chmod 600 "$install_dir/config/config.php" chmod 755 /home/yunohost.app chmod 750 $install_dir From 4eee86bab5f9777aaabb546a815edb730afdc814 Mon Sep 17 00:00:00 2001 From: ljf Date: Fri, 20 Jun 2025 20:14:54 +0200 Subject: [PATCH 081/185] [fix] Config upgrade + small fix double wc -l --- scripts/upgrade | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 245b8aa6..fbb2d383 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,16 +102,21 @@ exec_occ() { if mysql -e "USE $db_name" 2>/dev/null then # Migrate mysql db onto postgresql if the db is empty - if [[ "$(ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null | wc -l 2>/dev/null | wc -l)" == "0" ]] + ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null + if [[ "$(ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null | wc -l)" == "0" ]] then ynh_print_info "Migrating to PostgreSQL database..." exec_occ db:convert-type --all-apps --clear-schema pgsql $db_name 127.0.0.1 $db_name --password=$db_pwd -n fi # Remove mysql db if the postgresql db is not empty - if [[ "$(ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null | wc -l 2>/dev/null | wc -l)" != "0" ]] + if [[ "$(ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null | wc -l)" != "0" ]] then ynh_mysql_drop_db $db_name + nc_conf="${install_dir}/config/config.php" + ynh_write_var_in_file --file="$nc_conf" --key="dbtype" --value="pgsql" + ynh_write_var_in_file --file="$nc_conf" --key="dbuser" --value="$db_user" + ynh_write_var_in_file --file="$nc_conf" --key="dbpassword" --value="$db_pwd" fi fi From 05dff7b6909ac2f995f4abbc4fc6c0fc58350054 Mon Sep 17 00:00:00 2001 From: ljf Date: Fri, 20 Jun 2025 20:33:26 +0200 Subject: [PATCH 082/185] [fix] Backup config file before to replace it --- scripts/upgrade | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index fbb2d383..25d38227 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,7 +102,6 @@ exec_occ() { if mysql -e "USE $db_name" 2>/dev/null then # Migrate mysql db onto postgresql if the db is empty - ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null if [[ "$(ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null | wc -l)" == "0" ]] then ynh_print_info "Migrating to PostgreSQL database..." @@ -114,9 +113,13 @@ then then ynh_mysql_drop_db $db_name nc_conf="${install_dir}/config/config.php" + # Verify the checksum and backup the file if it's different + ynh_backup_if_checksum_is_different "$install_dir/config/config.php" + ynh_write_var_in_file --file="$nc_conf" --key="dbtype" --value="pgsql" ynh_write_var_in_file --file="$nc_conf" --key="dbuser" --value="$db_user" ynh_write_var_in_file --file="$nc_conf" --key="dbpassword" --value="$db_pwd" + ynh_store_file_checksum "$nc_conf" fi fi From 85777a01195f452d03f0c0b58cdc08801309b112 Mon Sep 17 00:00:00 2001 From: ljf Date: Fri, 20 Jun 2025 20:54:48 +0200 Subject: [PATCH 083/185] [fix] Remove warnings and check for free space --- scripts/upgrade | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 25d38227..940cba45 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -104,8 +104,12 @@ then # Migrate mysql db onto postgresql if the db is empty if [[ "$(ynh_psql_db_shell "$db_name" <<< "\dt" 2>/dev/null | wc -l)" == "0" ]] then + mysql_size=$(du -bs /var/lib/mysql/$app | awk '{print $1}') + mysql_size_human=$(du -hs /var/lib/mysql/$app | awk '{print $1}') + free_space=$(df --output=avail /var/lib/postgresql/*/main | tail -n1) + [ $mysql_size -ge $free_space ] && ynh_die "Unable to migrate the database $app ($mysql_size_human) due to lack of free space." ynh_print_info "Migrating to PostgreSQL database..." - exec_occ db:convert-type --all-apps --clear-schema pgsql $db_name 127.0.0.1 $db_name --password=$db_pwd -n + ynh_hide_warnings exec_occ db:convert-type --all-apps --clear-schema pgsql $db_name 127.0.0.1 $db_name --password=$db_pwd -n fi # Remove mysql db if the postgresql db is not empty From db259bc2780760d4f9766040ff82dfd6568052e1 Mon Sep 17 00:00:00 2001 From: ljf Date: Fri, 20 Jun 2025 21:12:30 +0200 Subject: [PATCH 084/185] [fix] free_space in MB instead of Bytes --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 940cba45..bda5a18b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -107,6 +107,7 @@ then mysql_size=$(du -bs /var/lib/mysql/$app | awk '{print $1}') mysql_size_human=$(du -hs /var/lib/mysql/$app | awk '{print $1}') free_space=$(df --output=avail /var/lib/postgresql/*/main | tail -n1) + free_space=$((free_space * 1024)) [ $mysql_size -ge $free_space ] && ynh_die "Unable to migrate the database $app ($mysql_size_human) due to lack of free space." ynh_print_info "Migrating to PostgreSQL database..." ynh_hide_warnings exec_occ db:convert-type --all-apps --clear-schema pgsql $db_name 127.0.0.1 $db_name --password=$db_pwd -n From 4082af649d8e0be479b3ca48c1122f29d601f118 Mon Sep 17 00:00:00 2001 From: ljf Date: Fri, 20 Jun 2025 21:14:29 +0200 Subject: [PATCH 085/185] [fix] Unneeded warning --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4020d0f2..d03c217b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -335,7 +335,7 @@ ynh_script_progression "Reapplying file permissions..." chown -R $app:www-data "$install_dir" find $install_dir/ -type f -print0 | xargs -r0 chmod 0644 find $install_dir/ -type d -print0 | xargs -r0 chmod 0755 -find "$install_dir/apps/"*/{bin,bin-ext} -type d -print0 | xargs -r0 chmod -R u+x +find "$install_dir/apps/"*/{bin,bin-ext} -type d -print0 2>/dev/null | xargs -r0 chmod -R u+x chmod 600 "$install_dir/config/config.php" chmod 755 /home/yunohost.app chmod 750 $install_dir From 7275030458c85764deeeba5ebdb5d91ad8c28003 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 2 Jul 2025 11:53:08 +0200 Subject: [PATCH 086/185] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e1545740..4b1194bc 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 = "31.0.6~ynh1" +version = "31.0.6~ynh2" maintainers = ["kay0u"] From 638fd47fbac3a47b2c620874557bcb3fc9021c64 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 2 Jul 2025 11:53:12 +0200 Subject: [PATCH 087/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 38cd81bd..862972f2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 31.0.6~ynh2](https://img.shields.io/badge/Version-31.0.6~ynh2-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From d40600b0d6fedca6401b45ce0e5b8305d82fecec Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 10 Jul 2025 13:52:14 +0200 Subject: [PATCH 088/185] Update manifest.toml --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 4b1194bc..d3c7485f 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 = "31.0.6~ynh2" +version = "31.0.7~ynh1" maintainers = ["kay0u"] @@ -61,12 +61,12 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.6.tar.bz2' - sha256 = 'a6abce1be84ae65090625895ee5796c6e631fd10cb17645ec4d73f7d9b372628' + url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.7.tar.bz2' + sha256 = '002a5d03ae05a7f0c3056947d6da0b79a44d3d720f5728fe5155a0c5a3b4ec69' [resources.sources.30] - url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.12.tar.bz2' - sha256 = '9e19b25f42273d4361218426b4762a766bee408cfa6aa8219f8c27f72095a7a8' + url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.13.tar.bz2' + sha256 = 'be2326a3af3d6072b4f14cdad393b9637aa3dc40caf56fd38175eea3a8ff8f86' prefetch = false [resources.sources.29] From 1a08783cf619a9e7e50718c198a2f4f85dde17e4 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 10 Jul 2025 14:23:01 +0200 Subject: [PATCH 089/185] Update tests.toml --- tests.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests.toml b/tests.toml index 7b873341..0e1c1a4b 100644 --- a/tests.toml +++ b/tests.toml @@ -7,8 +7,7 @@ test_format = 1.0 # ------------------------------- # Commits to test upgrade from # ------------------------------- - - test_upgrade_from.9c6d1eea.name = "Upgrade from 27.1.4" + test_upgrade_from.e9f82ab7.name = "Upgrade from 28.0.6" test_upgrade_from.541f5fde.name = "Upgrade from 29.0.8" test_upgrade_from.5bbe70c6.name = "Upgrade from 30.0.8" @@ -39,5 +38,5 @@ test_format = 1.0 [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" + test_upgrade_from.5bbe70c6.name = "Upgrade from 30.0.8" + test_upgrade_from.5bbe70c6.args.system_addressbook_exposed = "yes" From f56c10ac9e186507115b9f476b8bfbe16155215c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Fri, 18 Jul 2025 21:49:32 +0200 Subject: [PATCH 090/185] Update ADMIN.md: update advice to open shell + add a note on how to promote a user to admin --- doc/ADMIN.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 7e04712d..6d93e4c0 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,9 +1,22 @@ ### Manually running Nextcloud commands -You can run Nextcloud commands from the command line using: +You can run Nextcloud commands from the command line by opening a Nextcloud "shell" and running `php occ` directly: +```bash +sudo yunohost app shell __APP__ +# You should then see you're in a shell with "__APP__@yourmachine" +php occ ... ``` -sudo -u __APP__ php__PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ... -``` +Alternatively, you can run `sudo -u __APP__ php__PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...` + +## Promoting a user to admin + +In some cases, your user may not be a Nextcloud admin and therefore cannot access the admin panels from Nextcloud. -Alternatively, you may open a 'Nextcloud shell' with `sudo yunohost app shell __APP__`, then run `php occ ...` +This user can be added to the Nextcloud admin group with : + +```bash +sudo yunohost app shell __APP__ +# And then +php occ group:adduser admin +``` From bb69ceac3f8c28c4da84601cdd027f8e326ad7b1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 18 Jul 2025 21:49:34 +0200 Subject: [PATCH 091/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 862972f2..fe0f6de3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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~ynh2](https://img.shields.io/badge/Version-31.0.6~ynh2-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 31.0.7~ynh1](https://img.shields.io/badge/Version-31.0.7~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From fe097b002196b3abe3de04cff7683d0f24ade48e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Fri, 18 Jul 2025 21:49:54 +0200 Subject: [PATCH 092/185] Update ADMIN.md: markdown tweak --- doc/ADMIN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 6d93e4c0..de240f96 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -9,7 +9,7 @@ php occ ... ``` Alternatively, you can run `sudo -u __APP__ php__PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...` -## Promoting a user to admin +### Promoting a user to admin In some cases, your user may not be a Nextcloud admin and therefore cannot access the admin panels from Nextcloud. From 91b8a83811572abaa8726548f0dc8e5d4292e28e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Fri, 18 Jul 2025 21:57:30 +0200 Subject: [PATCH 093/185] Update ADMIN_fr.md: propagate changes to fr doc --- doc/ADMIN_fr.md | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 4a9e8789..5fb52009 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,9 +1,23 @@ ### Exécuter manuellement des commandes Nextcloud -Vous pouvez lancer des commandes Nextcloud depuis la ligne de commande avec: +Vous pouvez lancer des commandes Nextcloud en ouvrant un "shell" Nextcloud et utiliser `php occ` directement: +```bash +sudo yunohost app shell __APP__ +# Vous devriez voir que vous êtes dans un shell "__APP__@yourmachine" +php occ ... ``` -sudo -u __APP__ php__PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ... -``` -Ou bien, vous pouvez ouvrir un "shell Nextcloud" avec `sudo yunohost app shell __APP__`, puis lancer `php occ ...` +Autrement, vous pouvez exécuter `sudo -u __APP__ php__PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...` + +### Ajouter un compte aux admins de Nextcloud + +Dans certains cas, votre compte n'est peut-être pas un admin de Nextcloud et ne peut donc pas accéder aux fonctionnalités admin. + +Vous pouvez ajouter le comptes aux admins de Nextcloud avec: + +```bash +sudo yunohost app shell __APP__ +# Puis +php occ group:adduser admin +``` From 0de64f168c94ee44bae628140848a88afe081f7c Mon Sep 17 00:00:00 2001 From: Rodolphe Robles Date: Mon, 21 Jul 2025 22:49:40 +0200 Subject: [PATCH 094/185] fix settings enable_mail_forward in install and upgrade scripts --- scripts/install | 3 +++ scripts/upgrade | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/scripts/install b/scripts/install index 94177eca..f174799c 100755 --- a/scripts/install +++ b/scripts/install @@ -22,6 +22,9 @@ 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 + #================================================= # CREATE A MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d03c217b..fa7d8be0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,6 +30,20 @@ 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 + +# Fix enable_forward_email as a boolean +if [ "${enable_forward_email}" = "yes" ]; then + ynh_app_setting_set --key=enable_forward_email --value=1 + enable_forward_email=1 +elif [ "${enable_forward_email}" = "no" ]; 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 From 698abea509c20281455da7bb7fc03f259fe5e2ff Mon Sep 17 00:00:00 2001 From: Rodolphe Robles Date: Tue, 22 Jul 2025 23:26:50 +0200 Subject: [PATCH 095/185] try fix ldap_email-attribute --- conf/config.json | 2 +- manifest.toml | 2 +- scripts/config | 1 + scripts/install | 1 + scripts/upgrade | 11 +++++++++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/conf/config.json b/conf/config.json index 0c8d92f4..a63694a1 100644 --- 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/manifest.toml b/manifest.toml index d3c7485f..8194befc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -55,7 +55,7 @@ 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] diff --git a/scripts/config b/scripts/config index f2f19d89..9a356bed 100644 --- a/scripts/config +++ b/scripts/config @@ -140,6 +140,7 @@ 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 index f174799c..a57fcaab 100755 --- a/scripts/install +++ b/scripts/install @@ -24,6 +24,7 @@ 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 diff --git a/scripts/upgrade b/scripts/upgrade index fa7d8be0..c5a66eaf 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,6 +152,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 #================================================= @@ -281,12 +290,14 @@ if [ -f "$data_dir/data/nextcloud.log" ]; then exec_occ config:system:set logfile --value="/var/log/$app/nextcloud.log" fi + # Load the config file in nextcloud exec_occ config:import "$nc_conf" # Then remove the config file ynh_safe_rm "$nc_conf" + # Occasionally new mimetypes are added to better handle certain file types. # Migrating the mimetypes take a long time on larger instances # so this is not done automatically during upgrades. From 6909349b5c1fa0ee4be48b4dea9d913261742fa0 Mon Sep 17 00:00:00 2001 From: Rodolphe Robles Date: Wed, 23 Jul 2025 00:44:38 +0200 Subject: [PATCH 096/185] unused value settings --- scripts/config | 1 + scripts/upgrade | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/config b/scripts/config index 9a356bed..84d3c1dc 100644 --- a/scripts/config +++ b/scripts/config @@ -138,6 +138,7 @@ set__enable_forward_email() { elif [ "$enable_forward_email" -eq "1" ]; then exec_occ ldap:set-config "" ldapEmailAttribute "maildrop" fi + ynh_app_setting_set --app=$app --key=enable_forward_email --value="$enable_forward_email" } diff --git a/scripts/upgrade b/scripts/upgrade index c5a66eaf..6c425d9a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,15 +35,6 @@ if [ -z ${enable_forward_email:-} ]; then enable_forward_email=0 fi -# Fix enable_forward_email as a boolean -if [ "${enable_forward_email}" = "yes" ]; then - ynh_app_setting_set --key=enable_forward_email --value=1 - enable_forward_email=1 -elif [ "${enable_forward_email}" = "no" ]; 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 From 9c2b92f1cde5083c9c7d07fcbefef89d185618a7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 23 Jul 2025 00:44:46 +0200 Subject: [PATCH 097/185] Auto-update READMEs --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index fe0f6de3..cb39393b 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,10 @@ Online storage, file sharing platform and various other applications
+ +## 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/) From d334d284cc10876d9723db6ef68a8329ac061c50 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 24 Jul 2025 15:01:06 +0200 Subject: [PATCH 098/185] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e48d02f7..f770ecbc 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -488,7 +488,7 @@ ynh_config_add_logrotate #================================================= # Create a dedicated Fail2Ban config -ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" +#ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" #================================================= # CHECK IF NOTIFY_PUSH WORKS From ca188048c5c7d24091c21473bbab780df76d56db Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 24 Jul 2025 17:09:14 +0200 Subject: [PATCH 099/185] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index f770ecbc..e48d02f7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -488,7 +488,7 @@ ynh_config_add_logrotate #================================================= # Create a dedicated Fail2Ban config -#ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" +ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" #================================================= # CHECK IF NOTIFY_PUSH WORKS From 12505efc744911b8cf64facab7174ef75aa31ce3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 30 Jul 2025 08:11:00 +0200 Subject: [PATCH 100/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cb39393b..44029a77 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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.7~ynh1](https://img.shields.io/badge/Version-31.0.7~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 31.0.7~ynh2](https://img.shields.io/badge/Version-31.0.7~ynh2-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 3528f97ae4f3ed92af5f3dee473d5bc68cc4ef6f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 14 Aug 2025 11:56:12 +0200 Subject: [PATCH 101/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 44029a77..96a1f677 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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.7~ynh2](https://img.shields.io/badge/Version-31.0.7~ynh2-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 31.0.8~ynh1](https://img.shields.io/badge/Version-31.0.8~ynh1-rgba(0,150,0,1)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From cac3447e9b84f5e446d38f53793494c45842eb86 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 27 Sep 2025 19:34:02 +0200 Subject: [PATCH 102/185] Update manifest.toml --- manifest.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2e836c65..3d08dac0 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 = "31.0.9~ynh2" +version = "32.0.0~ynh1" maintainers = ["kay0u"] @@ -61,6 +61,10 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] + url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.0.tar.bz2' + sha256 = '57448d55d9b87102f17c36347320346a1b258f6017c63b958c789efd42e345a3' + + [resources.sources.31] url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.9.tar.bz2' sha256 = 'aab8414cc63581ca3a8df472f45eb412b2b843a966b3870275421bad0d670f68' From ef3fac04a060551e93830291971a032300678dec Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 27 Sep 2025 19:34:06 +0200 Subject: [PATCH 103/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c5878bc..4d98c62b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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.9~ynh2](https://img.shields.io/badge/Version-31.0.9~ynh2-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 32.0.0~ynh1](https://img.shields.io/badge/Version-32.0.0~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 4d9ab898de86e4e3226160e84c388f39d69db1b9 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 28 Sep 2025 18:45:20 +0200 Subject: [PATCH 104/185] Update manifest.toml --- manifest.toml | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3d08dac0..c13d8901 100644 --- a/manifest.toml +++ b/manifest.toml @@ -136,30 +136,29 @@ ram.runtime = "512M" "postgresql", "mariadb-server", "redis-server", - "php8.3-apcu", - "php8.3-bcmath", - "php8.3-bz2", - "php8.3-curl", - "php8.3-fpm", - "php8.3-gd", - "php8.3-gmp", - "php8.3-igbinary", - "php8.3-imagick", - "php8.3-imap", - "php8.3-intl", - "php8.3-ldap", - "php8.3-mbstring", - "php8.3-mysql", - "php8.3-pgsql", - "php8.3-redis", - "php8.3-sqlite3", - "php8.3-xml", - "php8.3-zip", + "php8.4-apcu", + "php8.4-bcmath", + "php8.4-bz2", + "php8.4-curl", + "php8.4-fpm", + "php8.4-gd", + "php8.4-gmp", + "php8.4-igbinary", + "php8.4-imagick", + "php8.4-imap", + "php8.4-intl", + "php8.4-ldap", + "php8.4-mbstring", + "php8.4-mysql", + "php8.4-pgsql", + "php8.4-redis", + "php8.4-sqlite3", + "php8.4-xml", + "php8.4-zip", ] packages_from_raw_bash = """ case $YNH_DEBIAN_VERSION in - bullseye) echo libmagickcore-6.q16-6-extra ;; bookworm) echo libmagickcore-6.q16-6-extra ;; trixie) echo libmagickcore-7.q16-10-extra ;; esac From f47e93cb094bbb4c1b09f8d82482561484bb4a50 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 28 Sep 2025 19:17:01 +0200 Subject: [PATCH 105/185] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 9a1dd50b..1da3c9e5 100755 --- a/scripts/install +++ b/scripts/install @@ -122,7 +122,7 @@ ynh_safe_rm "$install_dir/config.json" #================================================= # Check LDAP configuration to see if everything worked well -exec_occ ldap:test-config '' || ynh_die "An error occured during LDAP configuration" +#exec_occ ldap:test-config '' || ynh_die "An error occured during LDAP configuration" #================================================= # MOUNT HOME FOLDERS AS EXTERNAL STORAGE From 24ffa4182297cae3c4ebb713fd458dcecab87a95 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Oct 2025 23:09:21 +0200 Subject: [PATCH 106/185] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index c13d8901..cbea32df 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 = "32.0.0~ynh1" +version = "32.0.1~ynh1" maintainers = ["kay0u"] @@ -61,8 +61,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.0.tar.bz2' - sha256 = '57448d55d9b87102f17c36347320346a1b258f6017c63b958c789efd42e345a3' + url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.1.tar.bz2' + sha256 = '5810b06e75678384973d8d86387ee39f4c086d79dfa92f15fcb743aaba36eaa9' [resources.sources.31] url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.9.tar.bz2' From e1f22d8967b66dd69563df216af22264a3b9958f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 23 Oct 2025 23:09:24 +0200 Subject: [PATCH 107/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d98c62b..2baa9828 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 32.0.0~ynh1](https://img.shields.io/badge/Version-32.0.0~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 32.0.1~ynh1](https://img.shields.io/badge/Version-32.0.1~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 4c56dab24f62dceadf3c71ef5777eaf02ae97202 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 19 Nov 2025 22:22:48 +0100 Subject: [PATCH 108/185] Update config.json --- conf/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.json b/conf/config.json index a63694a1..1b354100 100644 --- a/conf/config.json +++ b/conf/config.json @@ -16,7 +16,7 @@ "hashing_default_password": true, "localstorage.allowsymlinks": true, "simpleSignUpLink.shown": false, - "default_phone_region": "", + "default_phone_region": "fr", "maintenance_window_start": 1, "mail_smtpmode": "smtp", "mail_smtpport": "25", From 515f07799935eed84aeafe3890a7390de0a8aab2 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Nov 2025 16:41:34 +0100 Subject: [PATCH 109/185] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index cbea32df..fada6b59 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 = "32.0.1~ynh1" +version = "32.0.2~ynh1" maintainers = ["kay0u"] @@ -61,8 +61,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.1.tar.bz2' - sha256 = '5810b06e75678384973d8d86387ee39f4c086d79dfa92f15fcb743aaba36eaa9' + url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.2.tar.bz2' + sha256 = '15ede19ad88ec724834dfad7fae306a72f932fd042f36b333fe2418155a937c5' [resources.sources.31] url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.9.tar.bz2' From 3914fff6f073ee9d4d233b7aa95255276f37745c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 20 Nov 2025 16:41:38 +0100 Subject: [PATCH 110/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2baa9828..94833c7a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 32.0.1~ynh1](https://img.shields.io/badge/Version-32.0.1~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 32.0.2~ynh1](https://img.shields.io/badge/Version-32.0.2~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 0fe02a0ff04494610e48b33e9c3f874567f1724e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Nov 2025 16:42:25 +0100 Subject: [PATCH 111/185] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index fada6b59..cd68749e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -65,8 +65,8 @@ ram.runtime = "512M" sha256 = '15ede19ad88ec724834dfad7fae306a72f932fd042f36b333fe2418155a937c5' [resources.sources.31] - url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.9.tar.bz2' - sha256 = 'aab8414cc63581ca3a8df472f45eb412b2b843a966b3870275421bad0d670f68' + url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.11.tar.bz2' + sha256 = '882f793aaba8b01e5982b64225226b32373152bbff1cd2c92e332e74970b7bc6' [resources.sources.30] url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.15.tar.bz2' From 874df103dba657791eb8c264b3be534f59c5f897 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 30 Nov 2025 08:53:16 +0100 Subject: [PATCH 112/185] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index cd68749e..ece269c7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -166,4 +166,3 @@ ram.runtime = "512M" [resources.database] type = "postgresql" - From 404e26265ea6000bb4a8a2987ebc7c64069c44e7 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 9 Dec 2025 09:34:09 +0100 Subject: [PATCH 113/185] Update install --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 1da3c9e5..a68a849c 100755 --- a/scripts/install +++ b/scripts/install @@ -7,11 +7,11 @@ source /usr/share/yunohost/helpers # INITIALIZE AND STORE SETTINGS #================================================= -ynh_app_setting_set --key=php_upload_max_filesize --value=10G -ynh_app_setting_set --key=php_memory_limit --value=512M +ynh_app_setting_set_default --key=php_upload_max_filesize --value=10G +ynh_app_setting_set_default --key=php_memory_limit --value=512M -ynh_app_setting_set --key=fpm_footprint --value=high -ynh_app_setting_set --key=fpm_usage --value=medium +ynh_app_setting_set_default --key=fpm_footprint --value=high +ynh_app_setting_set_default --key=fpm_usage --value=medium phpflags="--define apc.enable_cli=1" ynh_app_setting_set --key=phpflags --value="$phpflags" From b55601cee1dad3151f15d0176f4abe5f41ad5e05 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Dec 2025 12:48:36 +0100 Subject: [PATCH 114/185] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ece269c7..175f0d08 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 = "32.0.2~ynh1" +version = "32.0.3~ynh1" maintainers = ["kay0u"] @@ -61,8 +61,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.2.tar.bz2' - sha256 = '15ede19ad88ec724834dfad7fae306a72f932fd042f36b333fe2418155a937c5' + url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.3.tar.bz2' + sha256 = '9b71ac96c910b4a350d986bd3a92ea06f02a161fa586334b56d87d8acafc62d4' [resources.sources.31] url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.11.tar.bz2' From bbfb22c5492f7ba57df0b620c13293ad50cf3fad Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 11 Dec 2025 12:48:40 +0100 Subject: [PATCH 115/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94833c7a..6c7e4841 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 32.0.2~ynh1](https://img.shields.io/badge/Version-32.0.2~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 32.0.3~ynh1](https://img.shields.io/badge/Version-32.0.3~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From f5f455b50fa08c1c6c3706991768ff01d06c9387 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 31 Dec 2025 17:07:54 +0100 Subject: [PATCH 116/185] [autopatch] Automatic patch to simplify `proxy_pass`/`fastcgi_pass` options in nginx.conf (PLEASE DOUBLE CHECK BEFORE MERGING) --- conf/nginx.conf | 9 +-------- manifest.toml | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1b05c868..b731a4d2 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -111,21 +111,14 @@ location ^~ __PATH__/ { location ~ \.php(?:$|/) { # Required for legacy support rewrite ^__PATH__/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) __PATH__/index.php$request_uri; - - fastcgi_split_path_info ^(.+?\.php)(/.*)$; set $path_info $fastcgi_path_info; try_files $fastcgi_script_name =404; - - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_param PATH_INFO $path_info; - fastcgi_param HTTPS on; - fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice fastcgi_param front_controller_active true; # Enable pretty urls fastcgi_param HTTP_ACCEPT_ENCODING ""; # Disable encoding of Nextcloud response to inject ynh scripts fastcgi_pass unix:/var/run/php/php__PHP_VERSION__-fpm-__APP__.sock; + include fastcgi_params_with_auth; fastcgi_intercept_errors on; fastcgi_request_buffering on; # Required as PHP-FPM does not support chunked transfer encoding and requires a valid ContentLength header. diff --git a/manifest.toml b/manifest.toml index 2ee45ba2..3432bd68 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ code = "https://github.com/nextcloud/server" cpe = "cpe:2.3:a:nextcloud:nextcloud" [integration] -yunohost = ">= 12.1.17" +yunohost = ">= 12.1.38" helpers_version = "2.1" architectures = ["amd64", "arm64", "armhf"] multi_instance = true From 2641527ecae6d45db8f84db908ba0e0c9aaf3c23 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 2 Jan 2026 11:25:50 +0100 Subject: [PATCH 117/185] Update tests.toml --- tests.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.toml b/tests.toml index 29d1acd8..5c77d1c3 100644 --- a/tests.toml +++ b/tests.toml @@ -8,7 +8,6 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.e9f82ab7.name = "Upgrade from 28.0.6" test_upgrade_from.541f5fde.name = "Upgrade from 29.0.8" test_upgrade_from.5bbe70c6.name = "Upgrade from 30.0.8" From 89728b233943e86fe8e53fb45650074bd98c9008 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 15 Jan 2026 15:56:14 +0100 Subject: [PATCH 118/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c7e4841..d8add0f4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 32.0.3~ynh1](https://img.shields.io/badge/Version-32.0.3~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 32.0.4~ynh1](https://img.shields.io/badge/Version-32.0.4~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From c1aae5da34cba1081c2ac6325977e6d4c669c566 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 16 Jan 2026 16:55:11 +0100 Subject: [PATCH 119/185] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index e978af7e..36658195 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 = "32.0.4~ynh1" +version = "32.0.5~ynh1" maintainers = ["kay0u"] @@ -62,7 +62,7 @@ ram.runtime = "512M" [resources.sources.main] url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.4.tar.bz2' - sha256 = 'e0e934fc32e1efbdac0bc2edaeacbea85f519c4ebe012232daf34d3d920ce56a' + sha256 = '8dd0bc8f8e2d262edad11197d4a07af799b51fe872ee2d9259ffa19b43e543ad' [resources.sources.31] url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.13.tar.bz2' From 8ac47869afb9ee044c56bfe0d6d531d812a62cb0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 16 Jan 2026 16:55:19 +0100 Subject: [PATCH 120/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d8add0f4..0a1ee781 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 32.0.4~ynh1](https://img.shields.io/badge/Version-32.0.4~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 32.0.5~ynh1](https://img.shields.io/badge/Version-32.0.5~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 996ec118974799f6eecbfc04a13b05c6700483a0 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 16 Jan 2026 16:55:38 +0100 Subject: [PATCH 121/185] Update nginx.conf --- conf/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index b731a4d2..1d80eed1 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -70,7 +70,7 @@ location ^~ __PATH__/ { more_set_headers "X-Frame-Options: SAMEORIGIN"; more_set_headers "X-Permitted-Cross-Domain-Policies: none"; more_set_headers "X-Robots-Tag: noindex, nofollow"; - more_set_headers "X-XSS-Protection: 1; mode=block"; + #more_set_headers "X-XSS-Protection: 1; mode=block"; # Remove X-Powered-By, which is an information leak fastcgi_hide_header X-Powered-By; @@ -148,7 +148,7 @@ location ^~ __PATH__/ { more_set_headers "X-Frame-Options: SAMEORIGIN"; more_set_headers "X-Permitted-Cross-Domain-Policies: none"; more_set_headers "X-Robots-Tag: noindex, nofollow"; - more_set_headers "X-XSS-Protection: 1; mode=block"; + #more_set_headers "X-XSS-Protection: 1; mode=block"; access_log off; # Optional: Don't log access to assets } From 8349b5f8732a679b2c43035d1d93d58ddf0e5822 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 16 Jan 2026 17:11:44 +0100 Subject: [PATCH 122/185] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 36658195..34bbd470 100644 --- a/manifest.toml +++ b/manifest.toml @@ -61,7 +61,7 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.4.tar.bz2' + url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.5.tar.bz2' sha256 = '8dd0bc8f8e2d262edad11197d4a07af799b51fe872ee2d9259ffa19b43e543ad' [resources.sources.31] From 290963ba5b047af52765c60b91d38cc7a471575d Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 16 Jan 2026 17:20:56 +0100 Subject: [PATCH 123/185] Update nginx.conf --- conf/nginx.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1d80eed1..6cbed206 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -70,7 +70,6 @@ location ^~ __PATH__/ { more_set_headers "X-Frame-Options: SAMEORIGIN"; more_set_headers "X-Permitted-Cross-Domain-Policies: none"; more_set_headers "X-Robots-Tag: noindex, nofollow"; - #more_set_headers "X-XSS-Protection: 1; mode=block"; # Remove X-Powered-By, which is an information leak fastcgi_hide_header X-Powered-By; @@ -148,7 +147,6 @@ location ^~ __PATH__/ { more_set_headers "X-Frame-Options: SAMEORIGIN"; more_set_headers "X-Permitted-Cross-Domain-Policies: none"; more_set_headers "X-Robots-Tag: noindex, nofollow"; - #more_set_headers "X-XSS-Protection: 1; mode=block"; access_log off; # Optional: Don't log access to assets } From a6415065ab2f79c845231cb25b471562546963ab Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 27 Jan 2026 11:45:13 +0100 Subject: [PATCH 124/185] add port --- conf/notify_push.conf | 2 +- conf/systemd.service | 5 +++-- manifest.toml | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/conf/notify_push.conf b/conf/notify_push.conf index f2fb0520..2062b1cb 100644 --- a/conf/notify_push.conf +++ b/conf/notify_push.conf @@ -1,5 +1,5 @@ location ^~ __PATH__/push/ { - proxy_pass http://unix:/var/run/__APP__/notify-push.sock:/; + proxy_pass http://127.0.0.1:__PORT__/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; diff --git a/conf/systemd.service b/conf/systemd.service index 37effa16..94999dad 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,12 +1,13 @@ [Unit] Description=Push daemon for Nextcloud clients +After=network.target nginx.service +Documentation = https://github.com/nextcloud/notify_push [Service] Type=notify User=__APP__ Group=__APP__ -Environment=SOCKET_PATH=/var/run/__APP__/notify-push.sock -Environment=ALLOW_SELF_SIGNED=true +Environment = PORT=__PORT__ RuntimeDirectory=__APP__ ExecStart=__INSTALL_DIR__/apps/notify_push/bin/__ARCH__/notify_push __INSTALL_DIR__/config/config.php diff --git a/manifest.toml b/manifest.toml index dac56d76..ad2d9755 100644 --- a/manifest.toml +++ b/manifest.toml @@ -126,6 +126,8 @@ ram.runtime = "512M" api.protected= true api.allowed = ["visitors", "all_users"] + [resources.ports] + [resources.apt] packages = [ "imagemagick", From aaaeea042f83fd23d9f680160182d489b291e90b Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 27 Jan 2026 11:46:48 +0100 Subject: [PATCH 125/185] Update systemd.service --- conf/systemd.service | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/systemd.service b/conf/systemd.service index 94999dad..f59d67d4 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -10,6 +10,8 @@ Group=__APP__ Environment = PORT=__PORT__ RuntimeDirectory=__APP__ ExecStart=__INSTALL_DIR__/apps/notify_push/bin/__ARCH__/notify_push __INSTALL_DIR__/config/config.php +Restart = always +RestartSec = 60 # Sandboxing options to harden security # Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html From b192dfdbe04cebbbcfc1e40ed00416c6b3f243e7 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 27 Jan 2026 11:48:37 +0100 Subject: [PATCH 126/185] Update systemd.service --- conf/systemd.service | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index f59d67d4..80cf9dde 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,11 +7,12 @@ Documentation = https://github.com/nextcloud/notify_push Type=notify User=__APP__ Group=__APP__ -Environment = PORT=__PORT__ +Environment=PORT=__PORT__ +Environment=ALLOW_SELF_SIGNED=true RuntimeDirectory=__APP__ ExecStart=__INSTALL_DIR__/apps/notify_push/bin/__ARCH__/notify_push __INSTALL_DIR__/config/config.php -Restart = always -RestartSec = 60 +Restart=always +RestartSec=60 # Sandboxing options to harden security # Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html From e83496e1c5d34ba7ed8fc00d75ab18101220cb9f Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 27 Jan 2026 18:12:19 +0100 Subject: [PATCH 127/185] Update upgrade --- scripts/upgrade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 3b84cd8b..f2e44d69 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -320,6 +320,9 @@ ynh_safe_rm "$nc_conf" # Migrating the mimetypes take a long time on larger instances # so this is not done automatically during upgrades. exec_occ maintenance:repair --include-expensive +# New indexes are sometimes added (by Nextcloud or installed applications) +# to improve database performance. +exec_occ db:add-missing-indices #================================================= # ALLOW USERS TO DISCONNECT FROM NEXTCLOUD From 0e8d162c2c134ba3930c49cac5ecbeeb0a70f0d0 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 13 Feb 2026 15:48:40 +0100 Subject: [PATCH 128/185] Update tests.toml --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 5c77d1c3..e0bbecc1 100644 --- a/tests.toml +++ b/tests.toml @@ -8,7 +8,7 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.541f5fde.name = "Upgrade from 29.0.8" + #test_upgrade_from.541f5fde.name = "Upgrade from 29.0.8" test_upgrade_from.5bbe70c6.name = "Upgrade from 30.0.8" [default.curl_tests] From c32ec1e44572f8785a775eafe39522c7911c0674 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 13 Feb 2026 15:49:26 +0100 Subject: [PATCH 129/185] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 793558ce..ab2d961b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -65,8 +65,8 @@ ram.runtime = "512M" sha256 = '44bc33fc0e31a650bb520bb123c0aaa6519b7f7b9386133d561ade77e53f7130' [resources.sources.31] - url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.13.tar.bz2' - sha256 = '92df08369467e81c23d7fd997afb756eae44ce47eff0c85c5d4d27212ebe283e' + url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.14.tar.bz2' + sha256 = 'd0965eb2cbf68105743cbbe6eef404c89092cf92c40daee2c9cb9cf6edf63613' [resources.sources.30] url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.15.tar.bz2' From 5c79deacc1b8c02b367b68a8d8f86e6f24624175 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 16 Feb 2026 23:07:39 +0100 Subject: [PATCH 130/185] Update upgrade --- scripts/upgrade | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index f2e44d69..a2f865bf 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,11 +12,7 @@ ynh_app_setting_set_default --key=php_upload_max_filesize --value=10G ynh_app_setting_set_default --key=php_memory_limit --value=512M ynh_app_setting_set_default --key=enable_notify_push --value=0 - -if [ -z ${enable_forward_email:-} ]; then - ynh_app_setting_set --key=enable_forward_email --value=0 - enable_forward_email=0 -fi +ynh_app_setting_set_default --key=enable_forward_email --value=0 # Remove the option backup_core_only if it's in the settings.yml file ynh_app_setting_delete --key=backup_core_only @@ -29,7 +25,6 @@ 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 From 71785dd98c8c9fbb77af805f39fd59a428186ead Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Feb 2026 14:34:44 +0100 Subject: [PATCH 131/185] Update manifest.toml --- manifest.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ab2d961b..1fa42e92 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 = "32.0.6~ynh1" +version = "33.0.0~ynh1" maintainers = ["kay0u"] @@ -61,6 +61,10 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] + url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.0.tar.bz2' + sha256 = '' + + [resources.sources.32] url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.6.tar.bz2' sha256 = '44bc33fc0e31a650bb520bb123c0aaa6519b7f7b9386133d561ade77e53f7130' From f445a6417e9d193038748a79d5e2886a2ac3ab9c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 18 Feb 2026 14:34:48 +0100 Subject: [PATCH 132/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21d7350e..8172f5fc 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 32.0.6~ynh1](https://img.shields.io/badge/Version-32.0.6~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 33.0.0~ynh1](https://img.shields.io/badge/Version-33.0.0~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 966beac4c0c3b1421373277cb21ec8f6b2a8eca2 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Feb 2026 14:34:55 +0100 Subject: [PATCH 133/185] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 1fa42e92..004a7760 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,7 +62,7 @@ ram.runtime = "512M" [resources.sources.main] url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.0.tar.bz2' - sha256 = '' + sha256 = '6f7730902269c879f9f2ad4aa0a227cb16b5408ee46f093f68bd32633f741abf' [resources.sources.32] url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.6.tar.bz2' From 5b95b4d330e1403c9355fc5e83df98fd8340f077 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Feb 2026 14:36:10 +0100 Subject: [PATCH 134/185] Update manifest.toml --- manifest.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 92ecb2eb..e62972a1 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 = "32.0.6~ynh1" +version = "33.0.0~ynh1" maintainers = ["kay0u"] @@ -61,6 +61,10 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] + url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.0.tar.bz2' + sha256 = '6f7730902269c879f9f2ad4aa0a227cb16b5408ee46f093f68bd32633f741abf' + + [resources.sources.32] url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.6.tar.bz2' sha256 = '44bc33fc0e31a650bb520bb123c0aaa6519b7f7b9386133d561ade77e53f7130' From 5781d87cee1313e272310ae236aa8bedab8edd15 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 18 Feb 2026 14:36:14 +0100 Subject: [PATCH 135/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21d7350e..8172f5fc 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 32.0.6~ynh1](https://img.shields.io/badge/Version-32.0.6~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 33.0.0~ynh1](https://img.shields.io/badge/Version-33.0.0~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 3a2a16f407cb177e17f8633363b5b761967dede0 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Feb 2026 14:54:32 +0100 Subject: [PATCH 136/185] Update 00-add-logout_url-conf.patch --- patches/30/00-add-logout_url-conf.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/30/00-add-logout_url-conf.patch b/patches/30/00-add-logout_url-conf.patch index 8628b783..fd177f44 100644 --- a/patches/30/00-add-logout_url-conf.patch +++ b/patches/30/00-add-logout_url-conf.patch @@ -8,8 +8,8 @@ index d4d6a17db79..f587f805683 100644 $loginToken = $this->request->getCookie('nc_token'); + $uuidUser = $this->userSession->getUser()->getUID(); + $isLdapUser = $this->config->getUserValue($uuidUser, 'user_ldap', 'uid'); - if (!is_null($loginToken)) { -- $this->config->deleteUserValue($this->userSession->getUser()->getUID(), 'login_token', $loginToken); + if ($loginToken !== null && $uid !== null) { +- $this->config->deleteUserValue($uid, 'login_token', $loginToken); + $this->config->deleteUserValue($uuidUser, 'login_token', $loginToken); } $this->userSession->logout(); From 372aae96657e4379d23bc58e41ae92d4f3fcf5a9 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Feb 2026 15:00:17 +0100 Subject: [PATCH 137/185] Update 00-add-logout_url-conf.patch --- patches/main/00-add-logout_url-conf.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/main/00-add-logout_url-conf.patch b/patches/main/00-add-logout_url-conf.patch index 8628b783..fd177f44 100644 --- a/patches/main/00-add-logout_url-conf.patch +++ b/patches/main/00-add-logout_url-conf.patch @@ -8,8 +8,8 @@ index d4d6a17db79..f587f805683 100644 $loginToken = $this->request->getCookie('nc_token'); + $uuidUser = $this->userSession->getUser()->getUID(); + $isLdapUser = $this->config->getUserValue($uuidUser, 'user_ldap', 'uid'); - if (!is_null($loginToken)) { -- $this->config->deleteUserValue($this->userSession->getUser()->getUID(), 'login_token', $loginToken); + if ($loginToken !== null && $uid !== null) { +- $this->config->deleteUserValue($uid, 'login_token', $loginToken); + $this->config->deleteUserValue($uuidUser, 'login_token', $loginToken); } $this->userSession->logout(); From 56467a3293bed45568628cd1f9f97d77c8f98302 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Feb 2026 15:29:21 +0100 Subject: [PATCH 138/185] Update 00-add-logout_url-conf.patch --- patches/main/00-add-logout_url-conf.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/main/00-add-logout_url-conf.patch b/patches/main/00-add-logout_url-conf.patch index fd177f44..3c2a608c 100644 --- a/patches/main/00-add-logout_url-conf.patch +++ b/patches/main/00-add-logout_url-conf.patch @@ -25,6 +25,6 @@ index d4d6a17db79..f587f805683 100644 + $redirectUrl = $this->config->getSystemValue('logout_url', $redirectUrl); + } + $response = new RedirectResponse($redirectUrl); - + $this->session->set('clearingExecutionContexts', '1'); $this->session->close(); From 183675500394e5e5f24153b753d9bebae20206e7 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Feb 2026 15:44:59 +0100 Subject: [PATCH 139/185] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 004a7760..e6037231 100644 --- a/manifest.toml +++ b/manifest.toml @@ -161,6 +161,7 @@ ram.runtime = "512M" "php8.4-sqlite3", "php8.4-xml", "php8.4-zip", + "php8.4-smbclient", ] packages_from_raw_bash = """ From 1c42e590342b48100d149ba284a7f4a8afbddcb7 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 18 Feb 2026 15:45:44 +0100 Subject: [PATCH 140/185] Update manifest.toml --- manifest.toml | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/manifest.toml b/manifest.toml index e62972a1..1e7a8e60 100644 --- a/manifest.toml +++ b/manifest.toml @@ -139,24 +139,25 @@ ram.runtime = "512M" "at", "mariadb-server", "redis-server", - "php8.3-apcu", - "php8.3-bcmath", - "php8.3-bz2", - "php8.3-curl", - "php8.3-fpm", - "php8.3-gd", - "php8.3-gmp", - "php8.3-igbinary", - "php8.3-imagick", - "php8.3-imap", - "php8.3-intl", - "php8.3-ldap", - "php8.3-mbstring", - "php8.3-mysql", - "php8.3-redis", - "php8.3-sqlite3", - "php8.3-xml", - "php8.3-zip", + "php8.4-apcu", + "php8.4-bcmath", + "php8.4-bz2", + "php8.4-curl", + "php8.4-fpm", + "php8.4-gd", + "php8.4-gmp", + "php8.4-igbinary", + "php8.4-imagick", + "php8.4-imap", + "php8.4-intl", + "php8.4-ldap", + "php8.4-mbstring", + "php8.4-mysql", + "php8.4-redis", + "php8.4-sqlite3", + "php8.4-xml", + "php8.4-zip", + "php8.4-smbclient", ] packages_from_raw_bash = """ From fa45740fefc4bc70f5e803080fa63abc416c6aec Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 22 Feb 2026 17:49:18 +0100 Subject: [PATCH 141/185] cleaning --- doc/ADMIN.md | 8 ++++++-- doc/ADMIN_fr.md | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index de240f96..a718d008 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -4,7 +4,9 @@ You can run Nextcloud commands from the command line by opening a Nextcloud "she ```bash sudo yunohost app shell __APP__ -# You should then see you're in a shell with "__APP__@yourmachine" +``` +You should then see you're in a shell with "__APP__@yourmachine" +``` php occ ... ``` Alternatively, you can run `sudo -u __APP__ php__PHP_VERSION__ --define apc.enable_cli=1 __INSTALL_DIR__/occ ...` @@ -17,6 +19,8 @@ This user can be added to the Nextcloud admin group with : ```bash sudo yunohost app shell __APP__ -# And then +``` +And then +``` php occ group:adduser admin ``` diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 5fb52009..471912df 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -4,7 +4,9 @@ Vous pouvez lancer des commandes Nextcloud en ouvrant un "shell" Nextcloud et ut ```bash sudo yunohost app shell __APP__ -# Vous devriez voir que vous êtes dans un shell "__APP__@yourmachine" +``` +Vous devriez voir que vous êtes dans un shell "__APP__@yourmachine" +``` php occ ... ``` @@ -18,6 +20,8 @@ Vous pouvez ajouter le comptes aux admins de Nextcloud avec: ```bash sudo yunohost app shell __APP__ -# Puis +``` +Puis +``` php occ group:adduser admin ``` From 10a608d7274bc1d2273c686afcf32990656fb78b Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 22 Feb 2026 17:49:43 +0100 Subject: [PATCH 142/185] Update ADMIN_fr.md --- doc/ADMIN_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 471912df..c70e6ec2 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -5,7 +5,7 @@ Vous pouvez lancer des commandes Nextcloud en ouvrant un "shell" Nextcloud et ut ```bash sudo yunohost app shell __APP__ ``` -Vous devriez voir que vous êtes dans un shell "__APP__@yourmachine" +Vous devriez voir que vous êtes dans un shell `__APP__@yourmachine` ``` php occ ... ``` From 3ccbb4787e7f7721479319cd87d8f9a05088596d Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 22 Feb 2026 17:55:15 +0100 Subject: [PATCH 143/185] cleaning --- doc/DESCRIPTION.md | 2 +- doc/DESCRIPTION_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 4c681db5..3eb9f7e3 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -4,4 +4,4 @@ In the context of YunoHost, Nextcloud integrates with the SSO/User Portal (YunoH The `/.well-known` address will be automatically configured for CalDAV and CardDAV synchronization if no other service such as Baïkal is already using it. -The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) and [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), which can be integrated with Nextcloud. \ No newline at end of file +The YunoHost catalog has two collaborative office suites, [OnlyOffice](https://apps.yunohost.org/app/onlyoffice) and [Collabora](https://apps.yunohost.org/app/collabora), which can be integrated with Nextcloud. \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index a19201ad..7bc00ca5 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -4,4 +4,4 @@ Dans le cadre de YunoHost, Nextcloud s'intègre avec le SSO/portail utilisateur L'adresse `/.well-known` sera automatiquement configuré pour la synchronisation CalDAV et CardDAV si aucun autre service tel que Baïkal ne l'utilise déjà. -Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://github.com/YunoHost-Apps/onlyoffice_ynh) et [Collabora](https://github.com/YunoHost-Apps/collabora_ynh), qui peuvent être intégrées à Nextcloud. +Le catalogue YunoHost dispose de deux suites bureautiques collaboratives, [OnlyOffice](https://apps.yunohost.org/app/onlyoffice) et [Collabora](https://apps.yunohost.org/app/collabora), qui peuvent être intégrées à Nextcloud. From 891f0df0398b33f9d8f9f34c5b9ee25713fb8e64 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Feb 2026 19:09:24 +0100 Subject: [PATCH 144/185] Update nginx.conf (#850) * Update nginx.conf * Update nginx.conf * Update nginx.conf --- conf/nginx.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index b731a4d2..a9af095d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -6,6 +6,7 @@ include mime.types; types { text/javascript mjs; + application/wasm wasm; } location ^~ /.well-known { @@ -66,11 +67,9 @@ location ^~ __PATH__/ { # HTTP response headers borrowed from Nextcloud `.htaccess` more_set_headers "Referrer-Policy: no-referrer"; more_set_headers "X-Content-Type-Options: nosniff"; - more_set_headers "X-Download-Options: noopen"; more_set_headers "X-Frame-Options: SAMEORIGIN"; more_set_headers "X-Permitted-Cross-Domain-Policies: none"; more_set_headers "X-Robots-Tag: noindex, nofollow"; - more_set_headers "X-XSS-Protection: 1; mode=block"; # Remove X-Powered-By, which is an information leak fastcgi_hide_header X-Powered-By; @@ -138,7 +137,7 @@ location ^~ __PATH__/ { } # Serve static files - location ~ \.(?:css|js|mjs|svg|gif|ico|jpg|png|webp|wasm|tflite|map|ogg|flac)$ { + location ~ \.(?:css|js|mjs|svg|gif|ico|jpg|png|webp|wasm|tflite|map|ogg|flac|mp4|webm)$ { try_files $uri / __PATH__/index.php$request_uri; # Adapted from https://github.com/nextcloud/documentation/blob/master/admin_manual/installation/nginx-root.conf.sample # HTTP response headers borrowed from Nextcloud `.htaccess` @@ -148,7 +147,6 @@ location ^~ __PATH__/ { more_set_headers "X-Frame-Options: SAMEORIGIN"; more_set_headers "X-Permitted-Cross-Domain-Policies: none"; more_set_headers "X-Robots-Tag: noindex, nofollow"; - more_set_headers "X-XSS-Protection: 1; mode=block"; access_log off; # Optional: Don't log access to assets } From 5190a81c4870f4dfd446231b2499af95fb60df2b Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Feb 2026 19:09:53 +0100 Subject: [PATCH 145/185] Notify push (#856) * add port * Update systemd.service * Update systemd.service --- conf/notify_push.conf | 2 +- conf/systemd.service | 6 +++++- manifest.toml | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/notify_push.conf b/conf/notify_push.conf index f2fb0520..2062b1cb 100644 --- a/conf/notify_push.conf +++ b/conf/notify_push.conf @@ -1,5 +1,5 @@ location ^~ __PATH__/push/ { - proxy_pass http://unix:/var/run/__APP__/notify-push.sock:/; + proxy_pass http://127.0.0.1:__PORT__/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; diff --git a/conf/systemd.service b/conf/systemd.service index 37effa16..80cf9dde 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,14 +1,18 @@ [Unit] Description=Push daemon for Nextcloud clients +After=network.target nginx.service +Documentation = https://github.com/nextcloud/notify_push [Service] Type=notify User=__APP__ Group=__APP__ -Environment=SOCKET_PATH=/var/run/__APP__/notify-push.sock +Environment=PORT=__PORT__ Environment=ALLOW_SELF_SIGNED=true RuntimeDirectory=__APP__ ExecStart=__INSTALL_DIR__/apps/notify_push/bin/__ARCH__/notify_push __INSTALL_DIR__/config/config.php +Restart=always +RestartSec=60 # Sandboxing options to harden security # Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html diff --git a/manifest.toml b/manifest.toml index 1e7a8e60..3d95d257 100644 --- a/manifest.toml +++ b/manifest.toml @@ -130,6 +130,8 @@ ram.runtime = "512M" api.protected= true api.allowed = ["visitors", "all_users"] + [resources.ports] + [resources.apt] packages = [ "imagemagick", From 5b8a012ca96307f4dd19db1c8fa9281c9be0c702 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Feb 2026 19:50:18 +0100 Subject: [PATCH 146/185] Update tests.toml --- tests.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests.toml b/tests.toml index 8a4e7ae3..69a7f80f 100644 --- a/tests.toml +++ b/tests.toml @@ -8,7 +8,6 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.e9f82ab7.name = "Upgrade from 28.0.6" test_upgrade_from.541f5fde.name = "Upgrade from 29.0.8" test_upgrade_from.5bbe70c6.name = "Upgrade from 30.0.8" From 914fbcbc71b6d462510f843b00cf9ad70dd2245d Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Feb 2026 19:50:44 +0100 Subject: [PATCH 147/185] Update manifest.toml --- manifest.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 3d95d257..12aa7752 100644 --- a/manifest.toml +++ b/manifest.toml @@ -67,10 +67,12 @@ ram.runtime = "512M" [resources.sources.32] url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.6.tar.bz2' sha256 = '44bc33fc0e31a650bb520bb123c0aaa6519b7f7b9386133d561ade77e53f7130' - + prefetch = false + [resources.sources.31] url = 'https://download.nextcloud.com/server/releases/nextcloud-31.0.13.tar.bz2' sha256 = '92df08369467e81c23d7fd997afb756eae44ce47eff0c85c5d4d27212ebe283e' + prefetch = false [resources.sources.30] url = 'https://download.nextcloud.com/server/releases/nextcloud-30.0.15.tar.bz2' From 68a4e292ac41d8b56bafd41ce56e8d001a72e87e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Feb 2026 19:55:58 +0100 Subject: [PATCH 148/185] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index ced2b942..8d886b4a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,6 @@ 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 From bf26651b89794d5897c4ae3e192913f1767cea66 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Feb 2026 19:56:13 +0100 Subject: [PATCH 149/185] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8d886b4a..815050b7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -266,7 +266,6 @@ if [ -f "$data_dir/data/nextcloud.log" ]; then exec_occ config:system:set logfile --value="/var/log/$app/nextcloud.log" fi - # Load the config file in nextcloud exec_occ config:import "$nc_conf" From 4a268e9fc882d5349fdb2ff948f777bfab815bb3 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Feb 2026 20:03:34 +0100 Subject: [PATCH 150/185] Update tests.toml --- tests.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 69a7f80f..c1b55b60 100644 --- a/tests.toml +++ b/tests.toml @@ -8,8 +8,9 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.541f5fde.name = "Upgrade from 29.0.8" test_upgrade_from.5bbe70c6.name = "Upgrade from 30.0.8" + test_upgrade_from.446e9775.name = "Upgrade from 31.0.7" + test_upgrade_from.05f2feff.name = "Upgrade from 32.0.3" [default.curl_tests] #home.path = "/" From 43f0241e81dd70ccec390e4fc267a4036f2a0207 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Feb 2026 20:04:16 +0100 Subject: [PATCH 151/185] Update tests.toml --- tests.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests.toml b/tests.toml index c1b55b60..4f5231de 100644 --- a/tests.toml +++ b/tests.toml @@ -38,5 +38,5 @@ test_format = 1.0 [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" + test_upgrade_from.05f2feff.name = "Upgrade from 32.0.3" + test_upgrade_from.05f2feff.args.system_addressbook_exposed = "yes" From e82a092585bf2f3648758dfc70d49f69b49cd39c Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 26 Feb 2026 09:15:22 +0100 Subject: [PATCH 152/185] Update config --- scripts/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config b/scripts/config index 7eaf5758..119618c4 100644 --- a/scripts/config +++ b/scripts/config @@ -16,10 +16,10 @@ php_version=$(ynh_app_setting_get --key=php_version) get__maintenance_mode() { # Maintenance mode status maintenance_mode_status="$(cd "$install_dir" && ynh_exec_as_app php${php_version} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode)" 2> /dev/null - if echo $maintenance_mode_status | grep -q "disabled" + if echo "$maintenance_mode_status" | grep -q "disabled" then echo "0" - elif echo $maintenance_mode_status | grep -q "enabled" + elif echo "$maintenance_mode_status" | grep -q "enabled" then echo "1" else From d462db19c6cd730cfbb6023101b776207dc19e06 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 26 Feb 2026 17:36:35 +0100 Subject: [PATCH 153/185] Small improvements (#865) * cleaning * Update restore * cleaning * Update upgrade * Update upgrade --- scripts/backup | 2 +- scripts/change_url | 11 ++++++----- scripts/config | 12 ++++++------ scripts/install | 8 ++++---- scripts/remove | 2 +- scripts/restore | 8 ++++---- scripts/upgrade | 17 ++++++++++------- 7 files changed, 32 insertions(+), 28 deletions(-) diff --git a/scripts/backup b/scripts/backup index 3134150f..f65f9c80 100755 --- a/scripts/backup +++ b/scripts/backup @@ -50,7 +50,7 @@ ynh_psql_dump_db > db.sql # BACKUP THE NOTIFY_PUSH APP #================================================= -if [ $enable_notify_push -eq 1 ] +if [ ${enable_notify_push:-0} -eq 1 ] then ynh_backup "/etc/systemd/system/${app}-notify-push.service" ynh_backup "/etc/systemd/system/${app}-notify-push-watcher.service" diff --git a/scripts/change_url b/scripts/change_url index 449c14b4..7883ea99 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -8,7 +8,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Updating NGINX web server configuration..." -if [ $change_domain -eq 1 ] +if [ ${change_domain:-0} -eq 1 ] then # Check if .well-known is available for this domain if is_url_handled --domain="$new_domain" --path="/.well-known/caldav" || is_url_handled --domain="$new_domain" --path="/.well-known/carddav" @@ -28,7 +28,7 @@ ynh_config_change_url_nginx #================================================= ynh_script_progression "Applying $app specific modifications..." -if [ $change_domain -eq 1 ] +if [ ${change_domain:-0} -eq 1 ] then # Change the trusted domain exec_occ config:system:set trusted_domains 1 --value=$new_domain @@ -39,6 +39,7 @@ then # Reload PHP-FPM, necessary for force Nextcloud to re-read config.php, cf opcache.revalidate_freq ynh_systemctl --service=php${php_version}-fpm --action=reload + mkdir -p /etc/nginx/conf.d/$new_domain.d/$app.d mv /etc/nginx/conf.d/$old_domain.d/$app.d /etc/nginx/conf.d/$new_domain.d/$app.d fi @@ -46,7 +47,7 @@ fi # CONFIGURE NOTIFY_PUSH APP #================================================= -if [ $enable_notify_push -eq 1 ] +if [ ${enable_notify_push:-0} -eq 1 ] then domain="$new_domain" path_url="$new_path" @@ -67,13 +68,13 @@ then 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 ]] + while ! exec_occ $install_dir/cron.php && [[ $count -lt 30 ]] do sleep 1 count=$((count + 1)) done - ynh_systemctl --service="${app}-notify-push" --action=restart --wait_until="Push daemon for Nextcloud clients." --log_path="systemd" --action=restart + ynh_systemctl --service="${app}-notify-push" --action=restart --log_path="systemd" --wait_until="Push daemon for Nextcloud clients." exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push diff --git a/scripts/config b/scripts/config index 119618c4..79ea6cfa 100644 --- a/scripts/config +++ b/scripts/config @@ -15,7 +15,7 @@ php_version=$(ynh_app_setting_get --key=php_version) get__maintenance_mode() { # Maintenance mode status - maintenance_mode_status="$(cd "$install_dir" && ynh_exec_as_app php${php_version} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode)" 2> /dev/null + maintenance_mode_status="$(cd "$install_dir" && ynh_exec_as_app php${php_version} --define apc.enable_cli=1 occ --no-interaction --no-ansi maintenance:mode 2> /dev/null)" if echo "$maintenance_mode_status" | grep -q "disabled" then echo "0" @@ -47,11 +47,11 @@ get__enable_forward_email() { #================================================= set__maintenance_mode() { - if [ "$maintenance_mode" -eq "0" ]; then + if [ ${maintenance_mode:-0} -eq 0 ]; then # If maintenance_mode was set to 0, disable maintenance mode exec_occ maintenance:mode --off ynh_print_info "Maintenance mode disabled" - elif [ "$maintenance_mode" -eq "1" ]; then + elif [ ${maintenance_mode:-0} -eq 1 ]; then # If maintenance_mode was set to 1, enable maintenance mode exec_occ maintenance:mode --on ynh_print_info "Maintenance mode enabled" @@ -65,7 +65,7 @@ set__system_addressbook_exposed() { } set__enable_notify_push() { - if [ "$enable_notify_push" -eq "0" ]; then + if [ ${enable_notify_push:-0} -eq 0 ]; then nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d" ynh_safe_rm "$nginx_extra_conf_dir/notify_push.conf" ynh_systemctl --service="nginx" --action=reload @@ -81,7 +81,7 @@ set__enable_notify_push() { ynh_config_remove_systemd "${app}-notify-push-watcher" ynh_print_info "Notify push disabled" - elif [ "$enable_notify_push" -eq "1" ]; then + elif [ ${enable_notify_push:-0} -eq 1 ]; then nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d" mkdir -p "$nginx_extra_conf_dir" @@ -114,7 +114,7 @@ set__enable_notify_push() { count=0 - while ! ynh_exec_as_app php${php_version} --define apc.enable_cli=1 $install_dir/cron.php && [[ $count -lt 30 ]] + while ! exec_occ $install_dir/cron.php && [[ $count -lt 30 ]] do sleep 1 count=$((count + 1)) diff --git a/scripts/install b/scripts/install index 054de170..57a1752c 100755 --- a/scripts/install +++ b/scripts/install @@ -57,7 +57,7 @@ fi nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d" mkdir -p "$nginx_extra_conf_dir" -if [ $enable_notify_push -eq 1 ] +if [ ${enable_notify_push:-0} -eq 1 ] then ynh_config_add --template="notify_push.conf" --destination="$nginx_extra_conf_dir/notify_push.conf" fi @@ -201,7 +201,7 @@ ynh_store_file_checksum "$install_dir/config/config.php" # CONFIGURE NOTIFY_PUSH APP #================================================= -if [ $enable_notify_push -eq 1 ] +if [ ${enable_notify_push:-0} -eq 1 ] then exec_occ app:install notify_push exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push @@ -289,10 +289,10 @@ ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" # CHECK IF NOTIFY_PUSH WORKS #================================================= -if [ $enable_notify_push -eq 1 ] +if [ ${enable_notify_push:-0} -eq 1 ] then count=0 - while ! ynh_exec_as_app php${php_version} --define apc.enable_cli=1 $install_dir/cron.php && [[ $count -lt 30 ]] + while ! exec_occ $install_dir/cron.php && [[ $count -lt 30 ]] do sleep 1 count=$((count + 1)) diff --git a/scripts/remove b/scripts/remove index 720d7bb8..455f903c 100755 --- a/scripts/remove +++ b/scripts/remove @@ -18,7 +18,7 @@ ynh_safe_rm "/etc/nginx/conf.d/$domain.d/$app.d" ynh_config_remove_phpfpm # Remove notify push -if [ $enable_notify_push -eq 1 ]; then +if [ ${enable_notify_push:-0} -eq 1 ]; then ynh_config_remove_systemd "${app}-notify-push" systemctl disable --now --quiet ${app}-notify-push-watcher.path ynh_safe_rm "/etc/systemd/system/${app}-notify-push-watcher.path" diff --git a/scripts/restore b/scripts/restore index dea87036..e765cbf4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -108,7 +108,7 @@ ynh_systemctl --action=restart --service=fail2ban # RESTORE THE NOTIFY_PUSH APP #================================================= -if [ $enable_notify_push -eq 1 ] +if [ ${enable_notify_push:-0} -eq 1 ] then ynh_restore "/etc/systemd/system/${app}-notify-push.service" ynh_restore "/etc/systemd/system/${app}-notify-push-watcher.service" @@ -130,17 +130,17 @@ ynh_systemctl --service=nginx --action=reload # CHECK IF NOTIFY_PUSH WORKS #================================================= -if [ $enable_notify_push -eq 1 ] +if [ ${enable_notify_push:-0} -eq 1 ] then count=0 - while ! ynh_exec_as_app php${php_version} --define apc.enable_cli=1 $install_dir/cron.php && [[ $count -lt 30 ]] + while ! exec_occ $install_dir/cron.php && [[ $count -lt 30 ]] do sleep 1 count=$((count + 1)) done ynh_systemctl --service="${app}-notify-push-watcher" --action=restart - ynh_systemctl --service="${app}-notify-push" --action=restart --wait_until="Push daemon for Nextcloud clients." --log_path="systemd" --action=restart + ynh_systemctl --service="${app}-notify-push" --action=restart --log_path="systemd" --wait_until="Push daemon for Nextcloud clients." if ! exec_occ notify_push:self-test; then ynh_print_warn "The Notify Push service is still not working properly. Please log in with a user to your NextCloud instance, restart the Notify Push service with \"systemctl restart ${app}-notify-push.service\", and run \"ynh_exec_as_app php${php_version} $install_dir/occ notify_push:self-test\" to verify that everything is green." diff --git a/scripts/upgrade b/scripts/upgrade index 798575a0..5c1b804d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,7 +47,10 @@ last_major_version=${last_version%%.*} # Define a function to execute commands with `occ` exec_occ() { # Backward compatibility to upgrade from older versions - if [ $current_major_version -ge 30 ] + if [ $current_major_version -ge 33 ] + then + NEXTCLOUD_PHP_VERSION="8.4" + elif [ $current_major_version -ge 30 ] then NEXTCLOUD_PHP_VERSION="8.3" elif [ $current_major_version -ge 26 ] @@ -348,7 +351,7 @@ exec_occ config:system:set overwrite.cli.url --value="https://${domain}${path}" #================================================= # Enable External Storage and create local mount to home folder as needed -if [ $user_home -eq 1 ]; then +if [ ${user_home:-0} -eq 1 ]; then exec_occ app:enable files_external exec_occ files_external:list --output=json \ | grep -q '"storage":"\\\\OC\\\\Files\\\\Storage\\\\Local"' \ @@ -418,7 +421,7 @@ fi nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d" mkdir -p "$nginx_extra_conf_dir" -if [ $enable_notify_push -eq 1 ] +if [ ${enable_notify_push:-0} -eq 1 ] then ynh_config_add --template="notify_push.conf" --destination="$nginx_extra_conf_dir/notify_push.conf" fi @@ -429,7 +432,7 @@ ynh_config_add_nginx # CONFIGURE NOTIFY_PUSH APP #================================================= -if [ $enable_notify_push -eq 1 ] +if [ ${enable_notify_push:-0} -eq 1 ] then # If notify_push is disabled, reenable it if exec_occ app:list | awk '/Disabled/{f=1;next} f' | grep -q -w notify_push; then @@ -482,17 +485,17 @@ ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" # CHECK IF NOTIFY_PUSH WORKS #================================================= -if [ $enable_notify_push -eq 1 ] +if [ ${enable_notify_push:-0} -eq 1 ] then count=0 - while ! ynh_exec_as_app php${php_version} --define apc.enable_cli=1 $install_dir/cron.php && [[ $count -lt 30 ]] + while ! exec_occ $install_dir/cron.php && [[ $count -lt 30 ]] do sleep 1 count=$((count + 1)) done ynh_systemctl --service="${app}-notify-push-watcher" --action=restart - ynh_systemctl --service="${app}-notify-push" --action=restart --wait_until="Push daemon for Nextcloud clients." --log_path="systemd" --action=restart + ynh_systemctl --service="${app}-notify-push" --action=restart --log_path="systemd" --wait_until="Push daemon for Nextcloud clients." if ! exec_occ notify_push:self-test; then ynh_print_warn "The Notify Push service is still not working properly. Please log in with a user to your NextCloud instance, restart the Notify Push service with \"systemctl restart ${app}-notify-push.service\", and run \"ynh_exec_as_app php${php_version} $install_dir/occ notify_push:self-test\" to verify that everything is green." From 01e1927dd20aca860817173f353f0db126c786f0 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 26 Feb 2026 17:43:42 +0100 Subject: [PATCH 154/185] Update extra_php-fpm.conf --- conf/extra_php-fpm.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index a762cd02..75e9aedd 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -1,6 +1,8 @@ ; Additional php.ini defines, specific to this pool of workers. env[PATH] = $PATH +env[LANG] = $LANG +env[LC_ALL] = $LANG php_value[default_charset] = UTF-8 ; OPcache is already activated by default ; php_value[opcache.enable]=1 From 70323669a9b37a120d685c3dba43b8237a8b20f6 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 26 Feb 2026 23:01:34 +0100 Subject: [PATCH 155/185] Update config.json --- conf/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/config.json b/conf/config.json index 09d6fb3a..9d8ba73a 100644 --- a/conf/config.json +++ b/conf/config.json @@ -6,6 +6,7 @@ "memcache.local": "\\OC\\Memcache\\APCu", "integrity.check.disabled": true, "filelocking.enabled": true, + "lost_password_link": "disabled", "memcache.locking": "\\OC\\Memcache\\Redis", "redis": { "host": "localhost", From ac34ab37f03d0fdb18540dcbee77a70d2258440e Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Feb 2026 08:54:36 +0100 Subject: [PATCH 156/185] revert --- scripts/backup | 2 +- scripts/change_url | 6 +++--- scripts/config | 12 ++++++------ scripts/install | 7 ++----- scripts/remove | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 10 +++++----- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/scripts/backup b/scripts/backup index f65f9c80..3134150f 100755 --- a/scripts/backup +++ b/scripts/backup @@ -50,7 +50,7 @@ ynh_psql_dump_db > db.sql # BACKUP THE NOTIFY_PUSH APP #================================================= -if [ ${enable_notify_push:-0} -eq 1 ] +if [ $enable_notify_push -eq 1 ] then ynh_backup "/etc/systemd/system/${app}-notify-push.service" ynh_backup "/etc/systemd/system/${app}-notify-push-watcher.service" diff --git a/scripts/change_url b/scripts/change_url index 7883ea99..8ab20bda 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -8,7 +8,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Updating NGINX web server configuration..." -if [ ${change_domain:-0} -eq 1 ] +if [ $change_domain -eq 1 ] then # Check if .well-known is available for this domain if is_url_handled --domain="$new_domain" --path="/.well-known/caldav" || is_url_handled --domain="$new_domain" --path="/.well-known/carddav" @@ -28,7 +28,7 @@ ynh_config_change_url_nginx #================================================= ynh_script_progression "Applying $app specific modifications..." -if [ ${change_domain:-0} -eq 1 ] +if [ $change_domain -eq 1 ] then # Change the trusted domain exec_occ config:system:set trusted_domains 1 --value=$new_domain @@ -47,7 +47,7 @@ fi # CONFIGURE NOTIFY_PUSH APP #================================================= -if [ ${enable_notify_push:-0} -eq 1 ] +if [ $enable_notify_push -eq 1 ] then domain="$new_domain" path_url="$new_path" diff --git a/scripts/config b/scripts/config index 79ea6cfa..2a45043d 100644 --- a/scripts/config +++ b/scripts/config @@ -47,11 +47,11 @@ get__enable_forward_email() { #================================================= set__maintenance_mode() { - if [ ${maintenance_mode:-0} -eq 0 ]; then + if [ $maintenance_mode -eq 0 ]; then # If maintenance_mode was set to 0, disable maintenance mode exec_occ maintenance:mode --off ynh_print_info "Maintenance mode disabled" - elif [ ${maintenance_mode:-0} -eq 1 ]; then + elif [ $maintenance_mode -eq 1 ]; then # If maintenance_mode was set to 1, enable maintenance mode exec_occ maintenance:mode --on ynh_print_info "Maintenance mode enabled" @@ -65,7 +65,7 @@ set__system_addressbook_exposed() { } set__enable_notify_push() { - if [ ${enable_notify_push:-0} -eq 0 ]; then + if [ $enable_notify_push -eq 0 ]; then nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d" ynh_safe_rm "$nginx_extra_conf_dir/notify_push.conf" ynh_systemctl --service="nginx" --action=reload @@ -81,7 +81,7 @@ set__enable_notify_push() { ynh_config_remove_systemd "${app}-notify-push-watcher" ynh_print_info "Notify push disabled" - elif [ ${enable_notify_push:-0} -eq 1 ]; then + elif [ $enable_notify_push -eq 1 ]; then nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d" mkdir -p "$nginx_extra_conf_dir" @@ -133,9 +133,9 @@ set__enable_notify_push() { set__enable_forward_email() { - if [ "$enable_forward_email" -eq "0" ]; then + if [ $enable_forward_email -eq 0 ]; then exec_occ ldap:set-config "${ldap_config_prefix:-}" ldapEmailAttribute "mail" - elif [ "$enable_forward_email" -eq "1" ]; then + elif [ $enable_forward_email -eq 1 ]; then exec_occ ldap:set-config "${ldap_config_prefix:-}" ldapEmailAttribute "maildrop" fi } diff --git a/scripts/install b/scripts/install index 57a1752c..356964c2 100755 --- a/scripts/install +++ b/scripts/install @@ -9,13 +9,10 @@ source /usr/share/yunohost/helpers ynh_app_setting_set_default --key=php_upload_max_filesize --value=10G ynh_app_setting_set_default --key=php_memory_limit --value=512M - ynh_app_setting_set_default --key=fpm_footprint --value=high ynh_app_setting_set_default --key=fpm_usage --value=medium - ynh_app_setting_set_default --key=enable_notify_push --value=0 - phpflags="--define apc.enable_cli=1" ynh_app_setting_set --key=phpflags --value="$phpflags" @@ -201,7 +198,7 @@ ynh_store_file_checksum "$install_dir/config/config.php" # CONFIGURE NOTIFY_PUSH APP #================================================= -if [ ${enable_notify_push:-0} -eq 1 ] +if [ $enable_notify_push -eq 1 ] then exec_occ app:install notify_push exec_occ config:app:set notify_push base_endpoint --value https://$domain${path_url%/}/push @@ -289,7 +286,7 @@ ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" # CHECK IF NOTIFY_PUSH WORKS #================================================= -if [ ${enable_notify_push:-0} -eq 1 ] +if [ $enable_notify_push -eq 1 ] then count=0 while ! exec_occ $install_dir/cron.php && [[ $count -lt 30 ]] diff --git a/scripts/remove b/scripts/remove index 455f903c..720d7bb8 100755 --- a/scripts/remove +++ b/scripts/remove @@ -18,7 +18,7 @@ ynh_safe_rm "/etc/nginx/conf.d/$domain.d/$app.d" ynh_config_remove_phpfpm # Remove notify push -if [ ${enable_notify_push:-0} -eq 1 ]; then +if [ $enable_notify_push -eq 1 ]; then ynh_config_remove_systemd "${app}-notify-push" systemctl disable --now --quiet ${app}-notify-push-watcher.path ynh_safe_rm "/etc/systemd/system/${app}-notify-push-watcher.path" diff --git a/scripts/restore b/scripts/restore index e765cbf4..ef3ee4e4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -108,7 +108,7 @@ ynh_systemctl --action=restart --service=fail2ban # RESTORE THE NOTIFY_PUSH APP #================================================= -if [ ${enable_notify_push:-0} -eq 1 ] +if [ $enable_notify_push -eq 1 ] then ynh_restore "/etc/systemd/system/${app}-notify-push.service" ynh_restore "/etc/systemd/system/${app}-notify-push-watcher.service" @@ -130,7 +130,7 @@ ynh_systemctl --service=nginx --action=reload # CHECK IF NOTIFY_PUSH WORKS #================================================= -if [ ${enable_notify_push:-0} -eq 1 ] +if [ $enable_notify_push -eq 1 ] then count=0 while ! exec_occ $install_dir/cron.php && [[ $count -lt 30 ]] diff --git a/scripts/upgrade b/scripts/upgrade index 5c1b804d..edd60570 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -177,7 +177,7 @@ else ldap_email_attr="mail" fi -# Before NCv32, Yunohost was not using any prefix for the LDAP config. +# Before NCv32, YunoHost was not using any prefix for the LDAP config. # This is now mandatory so we need to create a new config with a prefix. if [ "${ldap_config_prefix:-}" = "" ] then @@ -351,7 +351,7 @@ exec_occ config:system:set overwrite.cli.url --value="https://${domain}${path}" #================================================= # Enable External Storage and create local mount to home folder as needed -if [ ${user_home:-0} -eq 1 ]; then +if [ $user_home -eq 1 ]; then exec_occ app:enable files_external exec_occ files_external:list --output=json \ | grep -q '"storage":"\\\\OC\\\\Files\\\\Storage\\\\Local"' \ @@ -421,7 +421,7 @@ fi nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d" mkdir -p "$nginx_extra_conf_dir" -if [ ${enable_notify_push:-0} -eq 1 ] +if [ $enable_notify_push -eq 1 ] then ynh_config_add --template="notify_push.conf" --destination="$nginx_extra_conf_dir/notify_push.conf" fi @@ -432,7 +432,7 @@ ynh_config_add_nginx # CONFIGURE NOTIFY_PUSH APP #================================================= -if [ ${enable_notify_push:-0} -eq 1 ] +if [ $enable_notify_push -eq 1 ] then # If notify_push is disabled, reenable it if exec_occ app:list | awk '/Disabled/{f=1;next} f' | grep -q -w notify_push; then @@ -485,7 +485,7 @@ ynh_config_add_fail2ban --logpath="/var/log/$app/nextcloud.log" # CHECK IF NOTIFY_PUSH WORKS #================================================= -if [ ${enable_notify_push:-0} -eq 1 ] +if [ $enable_notify_push -eq 1 ] then count=0 while ! exec_occ $install_dir/cron.php && [[ $count -lt 30 ]] From 5be926c5464a799c90f6197d0958c1e5fe6776b4 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Feb 2026 09:03:10 +0100 Subject: [PATCH 157/185] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 356964c2..c965a4b3 100755 --- a/scripts/install +++ b/scripts/install @@ -54,7 +54,7 @@ fi nginx_extra_conf_dir="/etc/nginx/conf.d/$domain.d/$app.d" mkdir -p "$nginx_extra_conf_dir" -if [ ${enable_notify_push:-0} -eq 1 ] +if [ $enable_notify_push -eq 1 ] then ynh_config_add --template="notify_push.conf" --destination="$nginx_extra_conf_dir/notify_push.conf" fi From e54d6c652d12a96557fbc759f11ec0c8edc47f85 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 28 Feb 2026 19:31:59 +0100 Subject: [PATCH 158/185] Update change_url --- scripts/change_url | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 5737de4e..7b6de95d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -49,7 +49,7 @@ fi if [ $enable_notify_push -eq 1 ] then - ynh_config_add --template="notify_push.conf" --destination="/etc/nginx/conf.d/$domain.d/$app.d/notify_push.conf" + ynh_config_add --template="notify_push.conf" --destination="/etc/nginx/conf.d/$new_domain.d/$app.d/notify_push.conf" ynh_systemctl --service=nginx --action=reload @@ -73,7 +73,7 @@ then ynh_systemctl --service="${app}-notify-push" --action=restart --log_path="systemd" --wait_until="Push daemon for Nextcloud clients." - exec_occ config:app:set notify_push base_endpoint --value=https://$domain${path_url%/}/push + exec_occ config:app:set notify_push base_endpoint --value=https://$new_domain${new_path%/}/push if ! exec_occ notify_push:self-test; then ynh_print_warn "The High Performance Backend service is still not working properly. Please log in with a user to your NextCloud instance, restart the High Performance Backend service with \"systemctl restart ${app}-notify-push.service\", and run \"sudo -u $app php${php_version} $install_dir/occ notify_push:self-test\" to verify that everything is green." From 0ced02364ac2c24c7d725ebe39f3a2d2dfa37b6f Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 26 Mar 2026 19:43:15 +0100 Subject: [PATCH 159/185] Update manifest.toml --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 94dbfee3..028f59ac 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 = "33.0.0~ynh1" +version = "33.0.1~ynh1" maintainers = ["kay0u"] @@ -61,12 +61,12 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.0.tar.bz2' - sha256 = '6f7730902269c879f9f2ad4aa0a227cb16b5408ee46f093f68bd32633f741abf' + url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.1.tar.bz2' + sha256 = 'd03f15de9dfa66ad738e37c50e77a4f017c2680cdcb98425c20dab4308d0f8cb' [resources.sources.32] - url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.6.tar.bz2' - sha256 = '44bc33fc0e31a650bb520bb123c0aaa6519b7f7b9386133d561ade77e53f7130' + url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.7.tar.bz2' + sha256 = '450b4f2b26c83be4d7b8682229a7d868e2802fd54ae8f3ee6367618995637a76' prefetch = false [resources.sources.31] From 9cf243071271e6df18b648fcb44a06e43e2087a7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 26 Mar 2026 19:43:19 +0100 Subject: [PATCH 160/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8172f5fc..c94c61bd 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 33.0.0~ynh1](https://img.shields.io/badge/Version-33.0.0~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 33.0.1~ynh1](https://img.shields.io/badge/Version-33.0.1~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From d38df077b91ae71e84144bff19100c795bf0f6a0 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 3 Apr 2026 17:53:03 +0200 Subject: [PATCH 161/185] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index d6badf68..54df41ca 100644 --- a/manifest.toml +++ b/manifest.toml @@ -65,8 +65,8 @@ ram.runtime = "512M" sha256 = '91257ab5002d5d09da8d09d80389983330351c5c00a7e3a25b177bcea81171cc' [resources.sources.32] - url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.7.tar.bz2' - sha256 = '450b4f2b26c83be4d7b8682229a7d868e2802fd54ae8f3ee6367618995637a76' + url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.8.tar.bz2' + sha256 = '58ad8ddf860d75a294b97a8e3e39562dec87ff650cb91c114589b3744ab1de0d' prefetch = false [resources.sources.31] From 04c4829e5832b17b5b54e43f7472cf022bafa970 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 30 Apr 2026 09:42:27 +0200 Subject: [PATCH 162/185] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 62d37286..d9169d77 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -164,7 +164,7 @@ then installed_apps_not_compatible_with_future_version="$(list_installed_apps_not_compatible_with_future_version $last_major_version)" if [[ -n "$installed_apps_not_compatible_with_future_version" ]] then - ynh_die "The following apps are not (yet?) compatible with Nextcloud $last_major_version. You should make sure to upgrade the app, or disable it, or wait for it to become compatible before running this upgrade : $installed_apps_not_compatible_with_future_version" + ynh_die "The following apps are not (yet?) compatible with Nextcloud $last_major_version. You should make sure to upgrade the app, or disable it, or wait for it to become compatible before running this upgrade: $installed_apps_not_compatible_with_future_version" fi fi From 5a6f6716523268690cc5c78b45d06c7682c80bac Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 2 May 2026 20:10:00 +0200 Subject: [PATCH 163/185] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 54df41ca..40852cfd 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 = "33.0.2~ynh1" +version = "33.0.3~ynh1" maintainers = ["kay0u"] @@ -61,8 +61,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.2.tar.bz2' - sha256 = '91257ab5002d5d09da8d09d80389983330351c5c00a7e3a25b177bcea81171cc' + url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.3.tar.bz2' + sha256 = '5c1052f860b35aa56b24bc2613a6bea0c22313b9fbd02bb0247c1f0b9dbf77d2' [resources.sources.32] url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.8.tar.bz2' From 0ebecf481de3d137c76096b79935aef74511d311 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 2 May 2026 20:10:05 +0200 Subject: [PATCH 164/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ae3e03a3..22dbb2a1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 33.0.2~ynh1](https://img.shields.io/badge/Version-33.0.2~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 33.0.3~ynh1](https://img.shields.io/badge/Version-33.0.3~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From bfe2fc6cbb828657f533b8784cac9c11dbf9c05c Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 2 May 2026 20:11:24 +0200 Subject: [PATCH 165/185] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 40852cfd..2a25cccc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ code = "https://github.com/nextcloud/server" cpe = "cpe:2.3:a:nextcloud:nextcloud" [integration] -yunohost = ">= 12.1.38" +yunohost = ">= 12.1.39" helpers_version = "2.1" architectures = ["amd64", "arm64", "armhf"] multi_instance = true From 6d1f8b4a50af01ce7c5f135469911f39aec9eb2c Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 28 May 2026 23:39:22 +0200 Subject: [PATCH 166/185] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2a25cccc..7b96c5f2 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 = "33.0.3~ynh1" +version = "33.0.4~ynh1" maintainers = ["kay0u"] @@ -61,8 +61,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.3.tar.bz2' - sha256 = '5c1052f860b35aa56b24bc2613a6bea0c22313b9fbd02bb0247c1f0b9dbf77d2' + url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.4.tar.bz2' + sha256 = 'f4b1cd6dd0525c6ba888f2cc1f0f1f53799d6d17cb0d7cf660542ec4cbcd7a72' [resources.sources.32] url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.8.tar.bz2' From 7501ac9fa342ff977f5711823b39526df6112c61 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 28 May 2026 23:39:46 +0200 Subject: [PATCH 167/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 22dbb2a1..11b22a96 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 33.0.3~ynh1](https://img.shields.io/badge/Version-33.0.3~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 33.0.4~ynh1](https://img.shields.io/badge/Version-33.0.4~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 3d2749aec79801bd70aa1d606e19a16a7b2ac6a1 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 8 Jun 2026 17:09:28 +0200 Subject: [PATCH 168/185] Update manifest.toml --- manifest.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7b96c5f2..5cce216b 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 = "33.0.4~ynh1" +version = "34.0.0~ynh1" maintainers = ["kay0u"] @@ -61,6 +61,10 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] + url = 'https://download.nextcloud.com/server/releases/nextcloud-34.0.0.tar.bz2' + sha256 = '36c557cedc2a1a12cd68cffe535f21350a02cbd4ff60dd7a9dae3959c7873be4' + + [resources.sources.33] url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.4.tar.bz2' sha256 = 'f4b1cd6dd0525c6ba888f2cc1f0f1f53799d6d17cb0d7cf660542ec4cbcd7a72' From e3bb6617cea0fa2e340940ffc9e68f495ff7f532 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 8 Jun 2026 17:09:33 +0200 Subject: [PATCH 169/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 11b22a96..74b027dd 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 33.0.4~ynh1](https://img.shields.io/badge/Version-33.0.4~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 34.0.0~ynh1](https://img.shields.io/badge/Version-34.0.0~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 275ae0e4fa57544b5dabc05f9d9721ddcfef1b39 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 Jun 2026 21:27:53 +0200 Subject: [PATCH 170/185] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2435d612..dae99a14 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 = "34.0.0~ynh1" +version = "34.0.1~ynh1" maintainers = ["kay0u"] @@ -61,8 +61,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-34.0.0.tar.bz2' - sha256 = '36c557cedc2a1a12cd68cffe535f21350a02cbd4ff60dd7a9dae3959c7873be4' + url = 'https://download.nextcloud.com/server/releases/nextcloud-34.0.1.tar.bz2' + sha256 = '04e9c32fc3fe39f6b6a8a18915ef5afd280a56b4a7f744e18f5fa2efffbc4a63' [resources.sources.33] url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.5.tar.bz2' From 01d8345e2d1c4fdd9afc973a5b1ffd1d1abac08d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 30 Jun 2026 21:27:58 +0200 Subject: [PATCH 171/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74b027dd..59698702 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 34.0.0~ynh1](https://img.shields.io/badge/Version-34.0.0~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 34.0.1~ynh1](https://img.shields.io/badge/Version-34.0.1~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From e94dc1ce5f7aa269aa2c7b444995621b8c75394c Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 7 Jul 2026 09:54:45 +0200 Subject: [PATCH 172/185] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index fdf72e28..ed5ec331 100644 --- a/manifest.toml +++ b/manifest.toml @@ -65,8 +65,8 @@ ram.runtime = "512M" sha256 = '04e9c32fc3fe39f6b6a8a18915ef5afd280a56b4a7f744e18f5fa2efffbc4a63' [resources.sources.33] - url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.5.tar.bz2' - sha256 = 'ed46b91d8da4e1f0234d0188b25bee9448fa2f301887e5b28013e6b547d6dcca' + url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.6.tar.bz2' + sha256 = '791821a55029944de04319cfcafcac4ae8e7ef56b4cd1efc2631bf30b79d16de' [resources.sources.32] url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.8.tar.bz2' From b521b3bf1f4132ccfa95018e890bb091fbd97770 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 7 Jul 2026 09:56:01 +0200 Subject: [PATCH 173/185] Update MAJOR_RELEASE.md --- doc/PRE_UPGRADE.d/MAJOR_RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/PRE_UPGRADE.d/MAJOR_RELEASE.md b/doc/PRE_UPGRADE.d/MAJOR_RELEASE.md index e210222a..d0cb94f8 100644 --- a/doc/PRE_UPGRADE.d/MAJOR_RELEASE.md +++ b/doc/PRE_UPGRADE.d/MAJOR_RELEASE.md @@ -1,4 +1,4 @@ -If you are upgrading to a **new major version** of Nextcloud (e.g. 32, 33), **please make sure that your Nextcloud apps are up to date** from Nextcloud's administration panel beforehand. +If you are upgrading to a **new major version** of Nextcloud (e.g. 33, 34), **please make sure that your Nextcloud apps are up to date** from Nextcloud's administration panel beforehand. Additionally, if you installed **specific Nextcloud apps**, we recommend **making sure that they are compatible with the new major version**. YunoHost will attempt to check this automatically at the very beginning of the upgrade, but a manual check doesn't hurt either. See https://apps.nextcloud.com/apps/ From 34bf596a8b372d17d0fda3b807aee82515afc913 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Jul 2026 18:09:26 +0200 Subject: [PATCH 174/185] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ed5ec331..bb795b3e 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 = "34.0.1~ynh1" +version = "34.0.2~ynh1" maintainers = ["kay0u"] @@ -61,8 +61,8 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-34.0.1.tar.bz2' - sha256 = '04e9c32fc3fe39f6b6a8a18915ef5afd280a56b4a7f744e18f5fa2efffbc4a63' + url = 'https://download.nextcloud.com/server/releases/nextcloud-34.0.2.tar.bz2' + sha256 = '41ce31df12cc81090c3d07fe0e8b90bde61c92b18ae80e4d648bad43d7991101' [resources.sources.33] url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.6.tar.bz2' From 0197749c92f99437dc8203713c76008655743cbf Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 23 Jul 2026 18:09:32 +0200 Subject: [PATCH 175/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59698702..adbaca47 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 34.0.1~ynh1](https://img.shields.io/badge/Version-34.0.1~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 34.0.2~ynh1](https://img.shields.io/badge/Version-34.0.2~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From b295112177e9e930822b791a6d2415403fc6950a Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 14 Aug 2026 12:41:22 +0200 Subject: [PATCH 176/185] Update manifest.toml --- manifest.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.toml b/manifest.toml index bb795b3e..c3ba7cc1 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 = "34.0.2~ynh1" +version = "34.0.3~ynh1" maintainers = ["kay0u"] @@ -61,16 +61,16 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-34.0.2.tar.bz2' - sha256 = '41ce31df12cc81090c3d07fe0e8b90bde61c92b18ae80e4d648bad43d7991101' + url = 'https://download.nextcloud.com/server/releases/nextcloud-34.0.3.tar.bz2' + sha256 = 'd7ed36ac0e14a2d9bbd167d6f6d4fc498f0f39fcccdf304e67e35bfc42e4506d' [resources.sources.33] - url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.6.tar.bz2' - sha256 = '791821a55029944de04319cfcafcac4ae8e7ef56b4cd1efc2631bf30b79d16de' + url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.8.tar.bz2' + sha256 = '70bad597b1e31002b04c03c80bf90f97f05e5d7ec91e4283439813149df22eff' [resources.sources.32] - url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.8.tar.bz2' - sha256 = '58ad8ddf860d75a294b97a8e3e39562dec87ff650cb91c114589b3744ab1de0d' + url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.14.tar.bz2' + sha256 = '7fb7a1a04b89f652be23a9409b37f76af6cb7220fd97618dfd6db275407e9625' prefetch = false [resources.sources.31] From 67643c3d986ecd29088b324f3731b2b954d99d43 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Aug 2026 12:41:26 +0200 Subject: [PATCH 177/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index adbaca47..0df24d0b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 34.0.2~ynh1](https://img.shields.io/badge/Version-34.0.2~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 34.0.3~ynh1](https://img.shields.io/badge/Version-34.0.3~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From af100516deae930cafddfcffcac19b60eeecd485 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 11 Sep 2026 09:05:48 +0200 Subject: [PATCH 178/185] Update manifest.toml --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index c3ba7cc1..fa1cd23d 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 = "34.0.3~ynh1" +version = "34.0.4~ynh1" maintainers = ["kay0u"] @@ -61,12 +61,12 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] - url = 'https://download.nextcloud.com/server/releases/nextcloud-34.0.3.tar.bz2' - sha256 = 'd7ed36ac0e14a2d9bbd167d6f6d4fc498f0f39fcccdf304e67e35bfc42e4506d' + url = 'https://download.nextcloud.com/server/releases/nextcloud-34.0.4.tar.bz2' + sha256 = '00f226e6364f96e0918ab06157158f66601b8cedc25af777f5ee5a3056f42b83' [resources.sources.33] - url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.8.tar.bz2' - sha256 = '70bad597b1e31002b04c03c80bf90f97f05e5d7ec91e4283439813149df22eff' + url = 'https://download.nextcloud.com/server/releases/nextcloud-33.0.9.tar.bz2' + sha256 = 'f331c1041d027e6588526d2a00ce42bc70a9622eab5871c0be9177252cf77423' [resources.sources.32] url = 'https://download.nextcloud.com/server/releases/nextcloud-32.0.14.tar.bz2' From 0b364a8546760518fbcb2a6babd6b7fd6cfaefb7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 11 Sep 2026 09:05:53 +0200 Subject: [PATCH 179/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0df24d0b..d2563224 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 34.0.3~ynh1](https://img.shields.io/badge/Version-34.0.3~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 34.0.4~ynh1](https://img.shields.io/badge/Version-34.0.4~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From e3d31a21e77415f0c40d1a2e5534683633d9e393 Mon Sep 17 00:00:00 2001 From: eric <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 16 Sep 2026 10:10:06 +0200 Subject: [PATCH 180/185] Update manifest.toml --- manifest.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index fa1cd23d..fe6bc45d 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 = "34.0.4~ynh1" +version = "35.0.0~ynh1" maintainers = ["kay0u"] @@ -61,6 +61,10 @@ ram.runtime = "512M" [resources.sources] [resources.sources.main] + url = 'https://download.nextcloud.com/server/releases/nextcloud-35.0.0.tar.bz2' + sha256 = 'd8c165e764a7a4de82eb3dec510d66e19f2d82218572604af9c15d99a98a29a0' + + [resources.sources.34] url = 'https://download.nextcloud.com/server/releases/nextcloud-34.0.4.tar.bz2' sha256 = '00f226e6364f96e0918ab06157158f66601b8cedc25af777f5ee5a3056f42b83' From 44995bb48dbbfc749ca6924676b8cfa6b484df54 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 16 Sep 2026 10:10:12 +0200 Subject: [PATCH 181/185] Auto-update READMEs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d2563224..648b097a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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: 34.0.4~ynh1](https://img.shields.io/badge/Version-34.0.4~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/) +[![Version: 35.0.0~ynh1](https://img.shields.io/badge/Version-35.0.0~ynh1-rgb(18,138,11)?style=for-the-badge)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
From 5b00c8bdac3d850dab9146806edbddcada6dce4d Mon Sep 17 00:00:00 2001 From: eric <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 16 Sep 2026 10:10:33 +0200 Subject: [PATCH 182/185] Update extra_php-fpm.conf --- conf/extra_php-fpm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index 75e9aedd..4944342c 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -7,7 +7,7 @@ php_value[default_charset] = UTF-8 ; OPcache is already activated by default ; php_value[opcache.enable]=1 ; The following parameters are nevertheless recommended for Nextcloud -; see here: https://docs.nextcloud.com/server/20/admin_manual/installation/server_tuning.html#enable-php-opcache +; see here: https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache php_value[opcache.enable_cli]=1 php_value[opcache.interned_strings_buffer]=32 php_value[opcache.max_accelerated_files]=10000 From 6096c5d0a857a647fc90d0e38472dbee8f46163f Mon Sep 17 00:00:00 2001 From: eric <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 16 Sep 2026 12:10:12 +0200 Subject: [PATCH 183/185] Update tests.toml --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 03fd71e6..678f1506 100644 --- a/tests.toml +++ b/tests.toml @@ -23,7 +23,7 @@ test_format = 1.0 admin.path = "/settings/admin" admin.logged_on_sso = true - admin.expect_title = "Basic settings - Nextcloud" + admin.expect_title = "Overview - Administration settings - Nextcloud" asset.path = "/core/img/logo/logo.svg" From 5428e97f7a90d0144a8b489c912948019973e301 Mon Sep 17 00:00:00 2001 From: eric <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 16 Sep 2026 12:31:42 +0200 Subject: [PATCH 184/185] Update tests.toml --- tests.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 678f1506..776d90bb 100644 --- a/tests.toml +++ b/tests.toml @@ -8,9 +8,10 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.5bbe70c6.name = "Upgrade from 30.0.8" + #test_upgrade_from.5bbe70c6.name = "Upgrade from 30.0.8" test_upgrade_from.446e9775.name = "Upgrade from 31.0.7" test_upgrade_from.05f2feff.name = "Upgrade from 32.0.3" + test_upgrade_from.fe69350c.name = "Upgrade from 34.0.4" [default.curl_tests] #home.path = "/" From edc5a1c563d1783d559a0fd87c81424dfbe904bd Mon Sep 17 00:00:00 2001 From: eric <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 18 Sep 2026 12:09:11 +0200 Subject: [PATCH 185/185] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 5edcbe11..d16e88d2 100755 --- a/scripts/install +++ b/scripts/install @@ -77,7 +77,7 @@ admin_password="$(ynh_string_random --length=6)" # Install Nextcloud using a temporary admin user exec_occ maintenance:install \ - --database "pgsql" --database-name $db_name \ + --database "pgsql" --database-port "5432" --database-name $db_name \ --database-user $db_user --database-pass "$db_pwd" \ --admin-user "admin" --admin-pass "$admin_password" \ --data-dir "$data_dir/data" \