Merge branch 'testing' into v2_PostgreSQL

README.md

@@ -29,7 +29,7 @@ In addition to Nextcloud core features, the following are made available with th
  * Serve `/.well-known` paths for CalDAV and CardDAV on the domain only if it's not already served - i.e. by Baïkal
 
 
-**Shipped version:** 28.0.0~ynh1
+**Shipped version:** 28.0.1~ynh1
 
 **Demo:** https://demo.nextcloud.com/
 

README_fr.md

@@ -29,7 +29,7 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv
  * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, Baïkal
 
 
-**Version incluse :** 28.0.0~ynh1
+**Version incluse :** 28.0.1~ynh1
 
 **Démo :** https://demo.nextcloud.com/
 

conf/nginx.conf

@@ -9,7 +9,7 @@ location ^~ /.well-known {
   location = /.well-known/carddav     { return 301 __PATH__/remote.php/dav/; }
   location = /.well-known/caldav      { return 301 __PATH__/remote.php/dav/; }
 
-  location = /.well-known/webfinger     { return 301 __PATH__/index.php$uri; }
+  location = /.well-known/webfinger     { return 301 __PATH__/index.php$request_uri; }
   location = /.well-known/nodeinfo      { return 301 __PATH__/index.php$uri; }
 
   # Let Nextcloud's API for `/.well-known` URIs handle all other

doc/ADMIN.md

@@ -6,16 +6,14 @@ or use `sudo yunohost app shell __APP__` then run `php occ ...`
 
 ### Configure ONLYOFFICE integration
 
-#### With Nextcloud App (no ARM support, lower performance)
+#### With YunoHost App (ARM64 support, better performance)
+
+For better performance and ARM64 support (Raspberry Pi, OLinuXino...), install ONLYOFFICE YunoHost App and connect it to Nextcloud, see the tutorial in the [doc of onlyoffice_ynh package](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server)
+
+#### Alternative: With Nextcloud App (no ARM support, lower performance)
 
 Nextcloud features a direct integration of ONLYOFFICE (an online rich text document editor) through a Nextcloud app.
 To install and configure it:
 - Install *Community Document Server* application in your Nextcloud. That's the part that runs ONLYOFFICE server.
 - Install *ONLYOFFICE* application. That's the client part that will connect to an ONLYOFFICE server.
 - Then in Settings -> ONLYOFFICE (`https://__DOMAIN____PATH__/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by ONLYOFFICE.
-
-*NB: ONLYOFFICE Nextcloud App is only available for x86 architecture - for **ARM** architecture (Raspberry Pi, OLinuXino...), consider the YunoHost App below*
-
-#### With YunoHost App (ARM64 support, better performance)
-
-For better performance and ARM64 support, install ONLYOFFICE YunoHost App and connect it to Nextcloud, see the tutorial in the [doc of onlyoffice_ynh package](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server)

doc/ADMIN_fr.md

@@ -6,7 +6,11 @@ ou utilisez `sudo yunohost app shell __APP__` puis `php occ ...`
 
 ### Configurer l'intégration d'ONLYOFFICE
 
-#### Avec l'application Nextcloud (pas de support ARM, performances limitées)
+#### Avec l'application YunoHost (support ARM64, meilleures performances)
+
+Pour  de meilleures performances et le support de ARM64 (Raspberry Pi, OLinuXino...), installez l'app YunoHost ONLYOFFICE, voir le tutoriel dans la [doc du paquet onlyoffice_ynh](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server)
+
+#### Alternative: Avec l'application Nextcloud (pas de support ARM, performances limitées)
 
 Nextcloud inclut une intégration directe de ONLYOFFICE (un éditeur de texte enrichi en ligne) via une application Nextcloud.
 Pour l'installer et la configurer :
@@ -14,8 +18,4 @@ Pour l'installer et la configurer :
 - Installez l'application *ONLYOFFICE*. C'est la partie cliente qui va se connecter au serveur ONLYOFFICE.
 - Ensuite dans les Paramètres -> ONLYOFFICE (`https://__DOMAIN____PATH__/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec ONLYOFFICE.
 
-*NB : l'app Nextcloud ONLYOFFICE Community Document Server n'est disponible que sous architecture x86 - Pour un support de l'architecture **ARM** (Raspberry Pi, OLinuXino...), installez plutôt l'App YunoHost, voir ci-dessous*
+*NB : l'app Nextcloud ONLYOFFICE Community Document Server n'est disponible que sous architecture x86
-
-#### Avec l'application YunoHost (support ARM64, meilleures performances)
-
-Pour  de meilleures performances et le support de ARM64, installez l'app YunoHost ONLYOFFICE, voir le tutoriel dans la [doc du paquet onlyoffice_ynh](https://github.com/YunoHost-Apps/onlyoffice_ynh/blob/master/README_fr.md#configuration-de-onlyoffice-server)

doc/POST_UPGRADE.md

@@ -1 +1 @@
-Note that if you've installed some third-parties Nextcloud applications, they are probably disabled and you'll have to manually enable them again.
+Note that if you've installed any third-party Nextcloud applications, they have probably been disabled. If so, you'll need to manually enable them again.

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 = "28.0.0~ynh1"
+version = "28.0.1~ynh1"
 
 maintainers = ["kay0u"]
 

scripts/change_url

@@ -33,7 +33,7 @@ then
 	exec_occ config:system:set trusted_domains 1 --value=$new_domain
 
 	# Change hostname for activity notifications
-    exec_occ config:system:set overwrite.cli.url --value="https://${new_domain}"
+    exec_occ config:system:set overwrite.cli.url --value="https://${new_domain}${new_path}"
 fi
 
 if [ $change_domain -eq 1 ]
@@ -49,6 +49,14 @@ then
 	fi
 fi
 
+#=================================================
+# SETUP SSOWAT
+#=================================================
+ynh_script_progression --message="Configuring permissions..."
+
+# Temporary fix for the API permission
+ynh_permission_url --permission="api" --url="re:$new_domain\/.well-known\/.*" --auth_header="false" --clear_urls
+
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/install

@@ -148,10 +148,10 @@ exec_occ ldap:test-config '' \
 # Define a function to add an external storage
 # Create the external storage for the given folders and enable sharing
 create_external_storage() {
-  local datadir="$1"
+  local mount_dir="$1"
   local mount_name="$2"
   local mount_id=`exec_occ files_external:create --output=json \
-      "$mount_name" 'local' 'null::null' -c "datadir=$data_dir/data" || true`
+      "$mount_name" 'local' 'null::null' -c "datadir=$mount_dir" || true`
   ! [[ $mount_id =~ ^[0-9]+$ ]] \
       && ynh_print_warn --message="Unable to create external storage" \
       || exec_occ files_external:option "$mount_id" enable_sharing true

scripts/upgrade

@@ -119,7 +119,7 @@ exec_occ() {
     fi
     if ! timeout 1 php$NEXTCLOUD_PHP_VERSION 2>/dev/null; then
         local pkg_dependencies="$(dpkg-query --show --showformat='${Depends}' ${app}-ynh-deps)"
-        pkg_dependencies="${pkg_dependencies/$phpversion/$NEXTCLOUD_PHP_VERSION}"
+        pkg_dependencies="${pkg_dependencies//$phpversion/$NEXTCLOUD_PHP_VERSION}"
         ynh_install_app_dependencies "$pkg_dependencies"
     fi 
 (cd "$install_dir" && ynh_exec_as "$app" \
@@ -151,10 +151,10 @@ fi
 # Define a function to add an external storage
 # Create the external storage for the given folders and enable sharing
 create_external_storage() {
-local datadir="$1"
+local mount_dir="$1"
 local mount_name="$2"
 local mount_id=$(exec_occ files_external:create --output=json \
-    "$mount_name" 'local' 'null::null' -c "datadir=$data_dir/data" || true)
+    "$mount_name" 'local' 'null::null' -c "datadir=$mount_dir" || true)
 ! [[ $mount_id =~ ^[0-9]+$ ]] \
     && ynh_print_warn --message="Unable to create external storage" \
     || exec_occ files_external:option "$mount_id" enable_sharing true

scripts/upgrade.d/upgrade.last.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Last available Nextcloud version
-next_version="28.0.0"
+next_version="28.0.1"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="4e8b0b74b40221e85f92ab869d0873c69a52d7e43889d9259c6259428a6a36f2"
+nextcloud_source_sha256="2f80735b443082272fe6a3b5e32137957f1fc448c75342b94b5200b29725f3a4"

sources/patches_last_version/app-00-add-logout_url-conf.patch

@@ -2,17 +2,17 @@ diff --git a/core/Controller/LoginController.php b/core/Controller/LoginControll
 index 13aef8f67a..55d8dbf9d1 100644
 --- a/core/Controller/LoginController.php
 +++ b/core/Controller/LoginController.php
-@@ -119,11 +119,12 @@ class LoginController extends Controller {
+@@ -97,11 +97,12 @@ class LoginController extends Controller {
  		}
  		$this->userSession->logout();
  
 -		$response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
 -			'core.login.showLoginForm',
--			['clear' => true] // this param the 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
 +		$redirectUrl = $this->config->getSystemValue('logout_url',
 +			$this->urlGenerator->linkToRouteAbsolute(
 +				'core.login.showLoginForm',
-+				['clear' => true] // this param the 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)
  		));
 -
 +		$response = new RedirectResponse($redirectUrl);

sources/patches_last_version/app-02-Allow-for-eval-in-JS-scripts-for-YunoHost-tile.patch

@@ -5,13 +5,13 @@ diff --git a/lib/public/AppFramework/Http/ContentSecurityPolicy.php b/lib/public
 index e9ecf00036..8e69c8d2dc 100644
 --- a/lib/public/AppFramework/Http/ContentSecurityPolicy.php
 +++ b/lib/public/AppFramework/Http/ContentSecurityPolicy.php
-@@ -44,7 +44,8 @@ class ContentSecurityPolicy extends EmptyContentSecurityPolicy {
+@@ -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 */
-	protected $strictDynamicAllowed = null;
-	/** @var array Domains from which scripts can get loaded */

tests.toml

@@ -8,4 +8,4 @@ test_format = 1.0
 
     test_upgrade_from.c5cf91ad.name = "Upgrade from 25.0.2"
     test_upgrade_from.caf917f3.name = "Upgrade from 26.0.2"
-    test_upgrade_from.0f16f720.name = "Upgrade from 27.0.2"
+    test_upgrade_from.9c6d1eea.name = "Upgrade from 27.1.4"