Merge pull request #377 from YunoHost-Apps/21.0.0

Upgrade to version 21.0.0

README.md

@@ -1,32 +1,40 @@
+
+
+---
+
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Nextcloud for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)
-[![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud)
+[![Install nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allow you to install Nextcloud quickly and simply on a YunoHost server.  
+> *This package allows you to install nextcloud quickly and simply on a YunoHost server.
-If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
 
-[Nextcloud](https://nextcloud.com) gives you freedom and control over your own data. A personal cloud which runs on your own server. With Nextcloud you can synchronize your files over your devices.
+Online storage, file sharing platform and various other applications
+
+**Shipped version:** 21.0.2~ynh1
+
+**Demo:** https://demo.nextcloud.com/
 
-**Shipped version:** 20.0.8
 
 ## Screenshots
 
-![](https://raw.githubusercontent.com/nextcloud/screenshots/master/files/Files%20Overview.png)
 
-## Demo
+   ![](./doc/screenshots/screenshot.png)
 
-* [YunoHost demo](https://demo.yunohost.org/nextcloud/)
-* [Official demo](https://demo.nextcloud.com/)
 
-## Documentation
 
- * Official documentation: https://docs.nextcloud.com/server/20/user_manual/en/
+
- * YunoHost documentation: https://github.com/YunoHost/doc/blob/master/app_nextcloud.md
+## Disclaimers / important information
 
 ## Configuration
 
@@ -52,47 +60,20 @@ this package:
  * 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
 
-#### Multi-users support
 
-#### Supported architectures
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/nextcloud%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
+## Documentation and resources
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/nextcloud%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/nextcloud/)
 
-## Limitations
+* Official app website: https://nextcloud.com
+* Official user documentation: https://yunohost.org/en/app_nextcloud
+* Official admin documentation: https://docs.nextcloud.com/server/21/user_manual/en/
+* Upstream app code repository:  https://github.com/nextcloud/server
+* YunoHost documentation for this app: https://yunohost.org/app_nextcloud
+* Report a bug: https://github.com/YunoHost-Apps/nextcloud_ynh/issues
 
-To integrate the logout button to the SSO, we have to patch Nextcloud sources. In waiting an upstream integration, the source code integrity checking has been disabled to prevent the warning message.
+## Developer info
 
-Also, note we made the choice to disable third-parties applications at the upgrade. It allows to prevent an unstable - and sometimes broken - Nextcloud installation. You will just have to manually activate them after the upgrade.
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing).
-
-Finally, the following error message in Nextcloud logs can be safely ignored:
-```
-Following symlinks is not allowed ('/home/yunohost.multimedia/user/Share' -> '/home/yunohost.multimedia/share/' not inside '/home/yunohost.multimedia/user/')
-```
-
-## Additionnal informations
-
-#### `occ` command usage
-
-If you need/want to use Nextcloud `occ` command¹, you need to be in `/var/www/nextcloud/` folder (or `/var/www/nextcloud__n/` depending on your instance number in case of multiple concurrent installations), then use `sudo -u nextcloud php7.3 occ` instead of `occ` (as an alternative, you can use `/var/www/nextcloud/occ` to run the command from another directory).
-
-*NB: You may need to adapt `php7.3` to the PHP version that Nextcloud is using. Starting from Nextcloud 18, YunoHost uses php7.3, it used before php7.0.*
-
-¹ See https://docs.nextcloud.com/server/18/admin_manual/configuration_server/occ_command.html
- Use this only if you know what you're doing :)
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/nextcloud_ynh/issues
- * Nextcloud website: https://nextcloud.com/
- * Nextcloud repository: https://github.com/nextcloud/server
- * YunoHost website: https://yunohost.org/
-
----
-
-## Developers infos
-
-Please do 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.
 ```
@@ -100,3 +81,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/te
 or
 sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps

README_fr.md

@@ -1,33 +1,32 @@
 # Nextcloud pour YunoHost
 
-[![Niveau d'integration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/nextcloud.svg)](https://dash.yunohost.org/appci/app/nextcloud) ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/nextcloud.maintain.svg)
-[![Installer Nextcloud avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud)
+[![Installer nextcloud avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=nextcloud)
 
 *[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
 
-> *Ce package vous permet d'installer Nextcloud rapidement et simplement sur un serveur YunoHost.   
+> *This package allows you to install nextcloud quickly and simply on a YunoHost server.
-Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Vue d'ensemble
 
-[Nextcloud](https://nextcloud.com) vous donne la liberté et le contrôle sur vos données. Un nuage personnel qui tourne sur votre serveur.
+Stockage en ligne, plateforme de partage de fichiers et diverses autres applications
-Avec NextCloud vous pouvez synchroniser vos fichiers sur vos appareils.
+
+**Version incluse:** 21.0.2~ynh1
+
+**Démo:** https://demo.nextcloud.com/
 
-**Version incluse :** 20.0.8
 
 ## Captures d'écran
 
-![](https://raw.githubusercontent.com/nextcloud/screenshots/master/files/Files%20Overview.png)
 
-## Démo
+   ![](./doc/screenshots/screenshot.png)
 
-* [Démo YunoHost](https://demo.yunohost.org/nextcloud/)
-* [Démo officielle](https://demo.nextcloud.com/)
 
-## Documentation
 
- * Documentation officielle : https://docs.nextcloud.com/server/20/user_manual/fr/
+
- * Documentation YunoHost : https://github.com/YunoHost/doc/blob/master/app_nextcloud_fr.md
+## Avertissements / informations importantes
 
 ## Configuration
 
@@ -52,41 +51,26 @@ En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suiv
  * Accès optionnel au répertoire home depuis les fichiers Nextcloud (à activer à l'installation, le partage étant activé par défaut)
  * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, baikal
 
-#### Support multi-utilisateurs
 
-#### Architectures supportées
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/nextcloud%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/nextcloud/)
+## Documentations et ressources
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/nextcloud%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/nextcloud/)
 
-## Limitations
+* Site official de l'app : https://nextcloud.com
-
+* Documentation officielle utilisateur: https://yunohost.org/en/app_nextcloud
-Pour intégrer le bouton de déconnexion du SSO, nous devons patcher les sources de Nextcloud.
+* Documentation officielle de l'admin: https://docs.nextcloud.com/server/21/user_manual/en/
-En attendant un intégration de leur part, la vérification d'intégrité du code source est désactivée pour ne pas avoir de message d'avertissement.
+* Dépôt de code officiel de l'app:  https://github.com/nextcloud/server
-
+* Documentation YunoHost pour cette app: https://yunohost.org/app_nextcloud
-Notez également que nous avons choisi de désactiver les applications tierces-parties lors des mises à jour. Ça permet d'éviter une installation de Nextcloud instable - ou qui pourrait planter.
+* Signaler un bug: https://github.com/YunoHost-Apps/nextcloud_ynh/issues
-Vous devrez juste les réactiver manuellement après chaque mise à jour.
-
-Et enfin, le message d'erreur suivant dans les logs de Nextcloud peut être ignoré sans problème :
-```
-Following symlinks is not allowed ('/home/yunohost.multimedia/user/Share' -> '/home/yunohost.multimedia/share/' not inside '/home/yunohost.multimedia/user/')
-```
-
-## Liens
-
- * Signaler un bug : https://github.com/YunoHost-Apps/nextcloud_ynh/issues
- * Site web de Nextcloud : https://nextcloud.com/
- * Dépôt de Nextcloud : https://github.com/nextcloud/server
- * Site web de YunoHost : https://yunohost.org/
- 
----
 
 ## Informations pour les développeurs
 
-Merci de faire votre « pull request » sur la [branche testing](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing).
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing).
-Pour tester la branche testing, faites comme ceci.
+
+Pour essayer la branche testing, procédez comme suit.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug
-ou
+or
 sudo yunohost app upgrade nextcloud -u https://github.com/YunoHost-Apps/nextcloud_ynh/tree/testing --debug
 ```
+
+**Plus d'infos sur le packaging d'applications:** https://yunohost.org/packaging_apps

check_process

@@ -1,8 +1,8 @@
 ;; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
+		domain="domain.tld"
-		path="/path"	(PATH)
+		path="/path"
-		admin="homer"	(USER)
+		admin="homer"
 		user_home="1"
 	; Checks
 		pkg_linter=1

conf/config.json

@@ -11,7 +11,8 @@
       "timeout": "0.0",
       "password": ""
      },
-    "hashing_default_password": true
+    "hashing_default_password": true,
+    "localstorage.allowsymlinks": true
   },
   "apps": {
     "user_ldap": {

conf/nextcloud.cron

@@ -1 +1 @@
-*/15  *  *  *  * __USER__ /usr/bin/php__YNH_PHP_VERSION__ -f __DESTDIR__/cron.php
+*/15  *  *  *  * __USER__ /usr/bin/php__PHPVERSION__ -f __FINALPATH__/cron.php

conf/nginx.conf

@@ -5,14 +5,13 @@ location ^~ /.well-known {
   # Uncomment it if you're planning to use this app.
   #rewrite ^/\.well-known/host-meta\.json  __PATH__/public.php?service=host-meta-json  last;
   #rewrite ^/\.well-known/host-meta        __PATH__/public.php?service=host-meta       last;
-  # The following 2 rules are only needed for the Social app.
-  # Uncomment it if you're planning to use this app.
-  #rewrite ^/\.well-known/webfinger        __PATH__/public.php?service=webfinger       last;
-  #rewrite ^/\.well-known/nodeinfo         __PATH__/public.php?service=nodeinfo        last;
 
   location = /.well-known/carddav     { return 301 __PATH__/remote.php/dav/; }
   location = /.well-known/caldav      { return 301 __PATH__/remote.php/dav/; }
  
+  location = /.well-known/webfinger     { return 301 __PATH__/index.php$uri; }
+  location = /.well-known/nodeinfo      { return 301 __PATH__/index.php$uri; }
+
   try_files $uri $uri/ =404;
 }
 

config_panel.toml

@@ -8,19 +8,19 @@ name = "Nextcloud configuration"
     name = "PHP-FPM configuration"
 
         [main.php_fpm_config.footprint]
-        ask = "Memory footprint of the service ?"
+        ask = "Memory footprint of the service?"
         choices = ["low", "medium", "high", "specific"]
         default = "low"
         help = "low <= 20Mb per pool. medium between 20Mb and 40Mb per pool. high > 40Mb per pool.<br>Use specific to set a value with the following option."
 
         [main.php_fpm_config.free_footprint]
-        ask = "Memory footprint of the service ?"
+        ask = "Memory footprint of the service?"
         type = "number"
         default = "0"
         help = "Free field to specify exactly the footprint in Mb if you don't want to use one of the three previous values."
 
         [main.php_fpm_config.usage]
-        ask = "Expected usage of the service ?"
+        ask = "Expected usage of the service?"
         choices = ["low", "medium", "high"]
         default = "low"
         help = "low: Personal usage, behind the sso. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.<br>medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.<br>high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding."

doc/DISCLAIMER.md

@@ -0,0 +1,23 @@
+## Configuration
+
+#### Configure OnlyOffice integration
+
+Starting from Nextcloud 18, it 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://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), if you want to configure which file formats should be opened by OnlyOffice.
+- Here you go :) You should be able to create new type of documents and open them.
+
+*NB: OnlyOffice is only available for x86 architecture - **ARM** architecture is **not** supported (Raspberry Pi, OLinuXino...)*
+
+## 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

doc/DISCLAIMER_fr.md

@@ -0,0 +1,22 @@
+## Configuration
+
+#### Configurer l'intégration d'OnlyOffice
+
+À partir de sa version 18, 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 :
+- Installez l'application *Community Document Server* dans votre Nextcloud. C'est la partie qui fait tourner un serveur OnlyOffice.
+- Installez l'application *ONLYOFFICE*. C'est la partie cliente qui va se connecter au serveur OnlyOffice.
+- Ensuite dans les Paramètres -> ONLYOFFICE (`https://yourdomain.tld/nextcloud/settings/admin/onlyoffice`), si vous voulez configurer quels formats de fichier s'ouvrent avec OnlyOffice.
+- Et voilà :) Vous devriez pouvoir créer de nouveaux types de documents, et les ouvrir.
+    
+*NB : OnlyOffice n'est disponible que sous architecture x86 - L'architecture **ARM** n'est **pas** supporté (Raspberry Pi, OLinuXino...)*
+
+## Caractéristiques spécifiques YunoHost
+
+En plus des fonctionnalités principales de Nextcloud, les fonctionnalités suivantes sont incluses dans ce package :
+
+ * Intégration avec les utilisateurs YunoHost et le SSO - exemple, le bouton de déconnexion
+ * Permet à un utilisateur d'être l'administrateur (choisi à l'installation)
+ * Permet de multiples instances de cette application
+ * Accès optionnel au répertoire home depuis les fichiers Nextcloud (à activer à l'installation, le partage étant activé par défaut)
+ * Utilise l'adresse `/.well-known` pour la synchronisation CalDAV et CardDAV du domaine si aucun autre service ne l'utilise déjà - par exemple, baikal

manifest.json

@@ -6,8 +6,16 @@
         "en": "Online storage, file sharing platform and various other applications",
         "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
     },
-    "version": "20.0.8~ynh1",
+    "version": "21.0.2~ynh1",
     "url": "https://nextcloud.com",
+    "upstream": {
+        "license": "AGPL-3.0",
+        "website": "https://nextcloud.com",
+        "demo": "https://demo.nextcloud.com/",
+        "admindoc": "https://docs.nextcloud.com/server/21/user_manual/en/",
+        "userdoc": "https://yunohost.org/en/app_nextcloud",
+        "code": "https://github.com/nextcloud/server"
+    },
     "license": "AGPL-3.0",
     "maintainer": {
         "name": "Kay0u",
@@ -27,29 +35,17 @@
             {
                 "name": "domain",
                 "type": "domain",
-                "ask": {
-                    "en": "Choose a domain for Nextcloud",
-                    "fr": "Choisissez un domaine pour Nextcloud"
-                },
                 "example": "domain.org"
             },
             {
                 "name": "path",
                 "type": "path",
-                "ask": {
-                    "en": "Choose a path for Nextcloud",
-                    "fr": "Choisissez un chemin pour Nextcloud"
-                },
                 "example": "/nextcloud",
                 "default": "/nextcloud"
             },
             {
                 "name": "admin",
                 "type": "user",
-                "ask": {
-                    "en": "Choose the Nextcloud administrator (must be an existing YunoHost user)",
-                    "fr": "Choisissez l'administrateur de Nextcloud (doit être un utilisateur YunoHost existant)"
-                },
                 "example": "homer"
             },
             {

scripts/install

@@ -84,9 +84,6 @@ cp -a ../sources/patches_last_version/* ../sources/patches
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
-# Allow Symlinks for multimedia folder
-ynh_replace_string --match_string="protected \$allowSymlinks = false;" --replace_string="protected \$allowSymlinks = true;" --target_file="$final_path/lib/private/Files/Storage/Local.php"
-
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -274,8 +271,8 @@ chown root: "$cron_path"
 chmod 644 "$cron_path"
 
 ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="$cron_path"
-ynh_replace_string --match_string="__DESTDIR__" --replace_string="$final_path" --target_file="$cron_path"
+ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$cron_path"
-ynh_replace_string --match_string="__YNH_PHP_VERSION__" --replace_string="$phpversion" --target_file="$cron_path"
+ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion" --target_file="$cron_path"
 
 exec_occ background:cron
 

scripts/upgrade

@@ -271,9 +271,6 @@ then
         # Install the next nextcloud version in $tmpdir
         ynh_setup_source --dest_dir="$tmpdir"
 
-        # Allow Symlinks for multimedia folder
-        ynh_replace_string --match_string="protected \$allowSymlinks = false;" --replace_string="protected \$allowSymlinks = true;" --target_file="$tmpdir/lib/private/Files/Storage/Local.php"
-
         # Enable maintenance mode
         exec_occ maintenance:mode --on
 
@@ -405,8 +402,8 @@ chown root: "$cron_path"
 chmod 644 "$cron_path"
 
 ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="$cron_path"
-ynh_replace_string --match_string="__DESTDIR__" --replace_string="$final_path" --target_file="$cron_path"
+ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$cron_path"
-ynh_replace_string --match_string="__YNH_PHP_VERSION__" --replace_string="$phpversion" --target_file="$cron_path"
+ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$phpversion" --target_file="$cron_path"
 
 exec_occ background:cron
 

scripts/upgrade.d/upgrade.20.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Last available nextcloud version
+next_version="21.0.0"
+
+# Nextcloud tarball checksum sha256
+nextcloud_source_sha256="ceadaeef67685a11afc5b23b0a86ba3c7bd0a7b138d5d1ecc05262383655f1f0"

scripts/upgrade.d/upgrade.last.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Last available Nextcloud version
-next_version="20.0.8"
+next_version="21.0.2"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="85746a4bda87bf754be5834cdb6489c365dc847653bab8ff3afccdaac3b356b5"
+nextcloud_source_sha256="5e5b38109a3485db5fd2d248f24478eabe6c0790ec10b030acbbee207d5511fe"