Merge pull request #250 from YunoHost-Apps/testing

2024-09-03 19:36:29 +02:00 · 2021-06-15 13:41:32 +02:00 · 2021-06-15 13:41:32 +02:00 · 2c55d7135f
commit 2c55d7135f
parent 1c2be138de 0c60412b3c
16 changed files with 346 additions and 81 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -0,0 +1,55 @@
+---
+name: Bug report
+about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently.
+
+---
+
+**How to post a meaningful bug report**
+1. *Read this whole template first.*
+2. *Determine if you are on the right place:*
+   - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!*
+   - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.*
+   - *When in doubt, post here and we will figure it out together.*
+3. *Delete the italic comments as you write over them below, and remove this guide.*
+--- 
+
+### Describe the bug
+
+*A clear and concise description of what the bug is.*
+
+### Context
+
+- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...*
+- YunoHost version: x.x.x
+- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...*
+- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes*
+  - If yes, please explain:
+- Using, or trying to install package version/branch:
+- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`*
+
+### Steps to reproduce
+
+- *If you performed a command from the CLI, the command itself is enough. For example:*
+    ```sh
+    sudo yunohost app install the_app
+    ```
+- *If you used the webadmin, please perform the equivalent command from the CLI first.*
+- *If the error occurs in your browser, explain what you did:*
+   1. *Go to '...'*
+   2. *Click on '...'*
+   3. *Scroll down to '...'*
+   4. *See error*
+
+### Expected behavior
+
+*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.*
+
+### Logs
+
+*When an operation fails, YunoHost provides a simple way to share the logs.*
+- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.*
+- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.*
+
+*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)*
+
+*If applicable and useful, add screenshots to help explain your problem.*
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,16 @@
+## Problem
+
+- *Description of why you made this PR*
+
+## Solution
+
+- *And how do you fix that problem*
+
+## PR Status
+
+- [ ] Code finished and ready to be reviewed/tested
+- [ ] The fix/enhancement were manually tested (if applicable)
+
+## Automatic tests
+
+Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization)
--- a/README.md
+++ b/README.md
@ -1,3 +1,8 @@
+<!--
+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.
+-->
+
 # Mattermost for YunoHost

 [![Integration level](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg)  
@ -5,43 +10,33 @@

 *[Lire ce readme en français.](./README_fr.md)*

-> *This package allows you to install Mattermost quickly and simply on a YunoHost server.  
+> *This package allows you to install Mattermost 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.*

 ## Overview
-Mattermost is a self-hosted, open source instant messaging and service software. It's designed as an internal chat for organizations and businesses, and it's touted as an alternative to Slack.

-**Shipped version:** <span class="version">5.34.2</span>
+Open source collaboration platform built for developers
+
+**Shipped version:** 5.35.3~ynh1
+
+

 ## Screenshots

-![](https://ucarecdn.com/8cd90d9d-8902-4845-a15b-f4664e5fcfb3/-/format/auto/-/quality/lighter/-/max_icc_size/10/-/resize/1288x/)
+![](./doc/screenshots/screenshot.png)
+
+## Disclaimers / important information

 ## Configuration

 * How to configure this app: From an admin panel, a plain file with SSH.

-## Documentation
-
- * Official documentation: https://docs.mattermost.com/
- * YunoHost documentation: https://yunohost.org/en/app_mattermost
-
 ## YunoHost specific features

 This package can install the [*Entreprise Edition*](https://docs.mattermost.com/overview/product.html#mattermost-enterprise-edition) or the [*Team Edition*](https://docs.mattermost.com/overview/product.html#mattermost-team-edition).

 Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/download/)

-#### Multi-user support
-
- * Are LDAP and HTTP auth supported? **No**
- * Can the app be used by multiple users? **Yes**
-
-#### Supported architectures
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mattermost.svg)](https://ci-apps.yunohost.org/ci/apps/mattermost/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mattermost.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mattermost/)
-
 ## Limitations

 * LDAP integration is not supported (see #58)
@ -50,14 +45,14 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d

 * This package can by installed on `ARM`, `ARM64` and `x86-64` architecture (only `x86-64` if you choose to install the *Entreprise Edition*).

-## Links
+## Documentation and resources

- * Report a bug: https://github.com/YunoHost-Apps/mattermost_ynh/issues
- * App website: http://www.mattermost.org/
- * Upstream app repository: https://github.com/mattermost/mattermost-server
- * YunoHost website: https://yunohost.org/
-
---
+* Official app website: http://www.mattermost.org/
+* Official user documentation: https://yunohost.org/en/app_mattermost
+* Official admin documentation: https://docs.mattermost.com/
+* Upstream app code repository: https://github.com/mattermost/mattermost-server
+* YunoHost documentation for this app: https://yunohost.org/app_mattermost
+* Report a bug: https://github.com/YunoHost-Apps/mattermost_ynh/issues

 ## Developer info

@ -69,3 +64,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/mattermost_ynh/tree/t
 or
 sudo yunohost app upgrade mattermost -u https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps
--- a/README_fr.md
+++ b/README_fr.md
@ -3,43 +3,34 @@
 [![Niveau d'intégration](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg)  
 [![Installer Mattermost avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mattermost)

-*[Read this readme in english.](./README.md)* 
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*

-> *Ce package vous permet d'installer Mattermost rapidement et simplement sur un serveur YunoHost.  
-Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
+> *Ce package vous permet d'installer Mattermost rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*

 ## Vue d'ensemble
-Mattermost est un logiciel et un service de messagerie instantanée libre auto-hébergeable. Il est conçu comme un chat interne pour les organisations et les entreprises, et il est présenté comme une alternative à Slack.

-**Version incluse :** <span class="version">5.34.2</span>
+Plateforme de collaboration open source conçue pour les développeurs
+
+**Version incluse :** 5.35.3~ynh1
+
+

 ## Captures d'écran

-![](https://ucarecdn.com/8cd90d9d-8902-4845-a15b-f4664e5fcfb3/-/format/auto/-/quality/lighter/-/max_icc_size/10/-/resize/1288x/)
+![](./doc/screenshots/screenshot.png)
+
+## Avertissements / informations importantes

 ## Configuration

 * Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH.

-## Documentation
-
- * Documentation officielle : https://docs.mattermost.com/
- * Documentation YunoHost : https://yunohost.org/fr/app_mattermost
-
 ## Caractéristiques spécifiques YunoHost

 Ce paquet peut installer la version [*Entreprise Edition*](https://docs.mattermost.com/overview/product.html#mattermost-enterprise-edition) ou la version [*Team Edition*](https://docs.mattermost.com/overview/product.html#mattermost-team-edition).

-#### Support multi-utilisateur
-
- * L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
- * L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui**
-
-#### Supported architectures
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mattermost.svg)](https://ci-apps.yunohost.org/ci/apps/mattermost/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mattermost.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mattermost/)
-
 ## Limitations

 * L'intégration LDAP n'est pas gérée (see #58)
@ -48,14 +39,14 @@ Ce paquet peut installer la version [*Entreprise Edition*](https://docs.mattermo

 Ce paquet peut être installé sur les architectures `ARM`, `ARM64` et `x86-64` (mais uniquement `x86-64` si vous choisissez d'installer la version *Enterprise Edition*).

-## Liens
+## Documentations et ressources

- * Signaler un bug : https://github.com/YunoHost-Apps/mattermost_ynh/issues
- * Site de l'application : http://www.mattermost.org/
- * Dépôt de l'application principale : https://github.com/mattermost/mattermost-server
- * Site web YunoHost : https://yunohost.org/
-
---
+* Site officiel de l'app : http://www.mattermost.org/
+* Documentation officielle utilisateur : https://yunohost.org/en/app_mattermost
+* Documentation officielle de l'admin : https://docs.mattermost.com/
+* Dépôt de code officiel de l'app : https://github.com/mattermost/mattermost-server
+* Documentation YunoHost pour cette app : https://yunohost.org/app_mattermost
+* Signaler un bug : https://github.com/YunoHost-Apps/mattermost_ynh/issues

 ## Informations pour les développeurs

@ -67,3 +58,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/mattermost_ynh/tree/t
 ou
 sudo yunohost app upgrade mattermost -u https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing --debug
 ```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
--- a/bump-mattermost.rb
+++ b/bump-mattermost.rb
@ -0,0 +1,144 @@
+#!/usr/bin/env ruby
+
+# [For package maintainers]
+# Edit the conf/*.src files with the given Mattermost release.
+#
+# Usage:
+#   ./bump-mattermost.rb mattermost-release-version
+#
+# Example:
+#   ./bump-mattermost.rb 5.33.2
+
+require 'digest'
+require 'json'
+require 'open-uri'
+
+module Mattermost
+  # Describe a Mattermost release from its version and variant.
+  class ReleaseDescription < Struct.new(:version, :variant)
+  end
+
+  # Retrieve a downloadable release's url and checksum from its ReleaseDescription.
+  class Release
+    attr_reader :version
+    attr_reader :variant
+    attr_reader :url
+    attr_reader :sum
+
+    def initialize(release_desc)
+      @version = release_desc.version
+      @variant = release_desc.variant
+
+      retrieve_release_data
+    end
+
+    private
+
+    def retrieve_release_data
+      case @variant
+      when :'x86-64', :enterprise
+        retrieve_first_party_release_data
+      when :arm, :arm64
+        retrieve_smart_honeybee_release_data
+      else
+        raise "Unsupported variant '{#release_desc.variant}'"
+      end
+    end
+
+    def retrieve_first_party_release_data
+      edition = {
+        'x86-64': 'team',
+        enterprise: 'enterprise'
+      }.fetch(variant)
+
+      @url = "https://releases.mattermost.com/#{version}/mattermost-#{edition}-#{version}-linux-amd64.tar.gz"
+
+      puts "Downloading release #{version}-#{variant} for computing checksum…"
+      release_file = URI.parse(@url).read
+      @sum = Digest::SHA256.hexdigest(release_file)
+    end
+
+    def retrieve_smart_honeybee_release_data
+      @url = "https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v#{version}/mattermost-v#{version}-linux-#{variant}.tar.gz"
+
+      sum_url = "#{url}.sha512sum"
+      URI.open(sum_url) do |sum_file|
+        @sum = sum_file.read.lines.first.split(' ').first
+      end
+    end
+  end
+end
+
+module Yunohost
+  class AppSrcFile
+    def initialize(path)
+      @path = path
+    end
+
+    def update_with_release(release)
+      src = File.read(@path)
+      replace_src_setting!(src, 'SOURCE_URL', release.url)
+      replace_src_setting!(src, 'SOURCE_SUM', release.sum)
+      replace_src_setting!(src, 'SOURCE_FILENAME', File.basename(URI.parse(release.url).path))
+      File.write(@path, src)
+    end
+
+    private
+
+    def replace_src_setting!(str, setting, value)
+      str.gsub!(/^#{setting}=.*$/, "#{setting}=#{value}")
+    end
+  end
+
+  class ReadmeFile
+    def initialize(path)
+      @path = path
+    end
+
+    def update_with_version(version)
+      readme = File.read(@path)
+      readme.gsub!(/[0-9\.]+~ynh[0-9]+/, "#{version}~ynh1")
+      File.write(@path, readme)
+    end
+  end
+
+  class ManifestFile
+    def initialize(path)
+      @path = path
+    end
+
+    def update_with_version(version)
+      manifest_file = File.read(@path)
+      manifest = JSON.parse(manifest_file)
+
+      manifest['version'] = "#{version}~ynh1"
+
+      manifest_file = JSON.pretty_generate(manifest, indent: '    ') + "\n"
+      File.write(@path, manifest_file)
+    end
+  end
+end
+
+version=ARGV[0]
+if version.nil?
+  abort("ERROR: The Mattermost release version must be provided.\nExample: ./bump-mattermost.sh 5.33.1")
+end
+
+VARIANTS = %i[x86-64 enterprise arm arm64]
+
+# Compute releases URLs and sums
+releases = VARIANTS
+  .map { |variant| Mattermost::ReleaseDescription.new(version, variant) }
+  .map { |description| Mattermost::Release.new(description) }
+
+# Update conf/*.src files
+releases.each do |r|
+  Yunohost::AppSrcFile.new("conf/#{r.variant}.src").update_with_release(r)
+end
+
+# Update manifest file
+Yunohost::ManifestFile.new('manifest.json').update_with_version(version)
+
+# Update documentation files
+Yunohost::ReadmeFile.new('README.md').update_with_version(version)
+Yunohost::ReadmeFile.new('README_fr.md').update_with_version(version)
--- a/16
+++ b/16
@ -1,8 +1,8 @@
 ;; Test with Enterprise Edition
    ; Manifest
-        domain="domain.tld" (DOMAIN)
-        path="/path"    (PATH)
-        admin="john"    (USER)
+        domain="domain.tld"
+        path="/path"
+        admin="john"
        email="john@gmail.com"
        admin_email="john@gmail.com"
        password="admin!42"
@ -10,7 +10,7 @@
        language="fr"
        version="Enterprise"
        team_display_name="Mon équipe"
-        is_public=1 (PUBLIC|public=1|private=0)
+        is_public=1
    ; Checks
        pkg_linter=1
        setup_sub_dir=1
@ -26,9 +26,9 @@
        change_url=1
 ;; Test with Team Edition
    ; Manifest
-        domain="domain.tld" (DOMAIN)
-        path="/path"    (PATH)
-        admin="john"    (USER)
+        domain="domain.tld"
+        path="/path"
+        admin="john"
        email="john@gmail.com"
        admin_email="john@gmail.com"
        password="admin!42"
@ -36,7 +36,7 @@
        language="fr"
        version="Team"
        team_display_name="Mon équipe"
-        is_public=1 (PUBLIC|public=1|private=0)
+        is_public=1
    ; Checks
        setup_sub_dir=1
        setup_root=1
--- a/conf/arm.src
+++ b/conf/arm.src
@ -1,6 +1,6 @@
-SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.34.2/mattermost-v5.34.2-linux-arm.tar.gz
-SOURCE_SUM=98805b54f0f5403fbee943d2a338a781813392ac7789f3f14ed688833d5578a2000e1af20d245ef75e6beb5ae1f129eda9bd2484e63505653a80b8c97d3d3b0b
+SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.35.3/mattermost-v5.35.3-linux-arm.tar.gz
+SOURCE_SUM=5b5f3280f23b263594e8bf7eba3b762a15de38f4e3edd81584b8099e6e027ea00ae1aee8f85570351518af30e4038ba784bbf84ea7943904e7095600c1cdb6d4
 SOURCE_SUM_PRG=sha512sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=mattermost-v5.34.2-linux-arm.tar.gz
+SOURCE_FILENAME=mattermost-v5.35.3-linux-arm.tar.gz
--- a/conf/arm64.src
+++ b/conf/arm64.src
@ -1,6 +1,6 @@
-SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.34.2/mattermost-v5.34.2-linux-arm64.tar.gz
-SOURCE_SUM=345c1e3aecd75abdc1b734fc21802698b5ff2b00a9eded47b3ad985706a6352a924e2aa0e1e638119ade09bd4c1689ae18122aba496a45430734b5097c51adc9
+SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.35.3/mattermost-v5.35.3-linux-arm64.tar.gz
+SOURCE_SUM=e8152b5a0ad0cd7ffc2a41de2e753c2361b3493fb0e77b29ad8ed5e685e457801013ecbee6a15d7bd03345ddced374b8a6f92f1dcc7578466df8ad8f61ff435a
 SOURCE_SUM_PRG=sha512sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=mattermost-v5.34.2-linux-arm64.tar.gz
+SOURCE_FILENAME=mattermost-v5.35.3-linux-arm64.tar.gz
--- a/conf/config.json
+++ b/conf/config.json
@ -29,6 +29,7 @@
    "EnablePostUsernameOverride": false,
    "EnablePostIconOverride": false,
    "EnableLinkPreviews": true,
+    "RestrictLinkPreviews": "",
    "EnableTesting": false,
    "EnableDeveloper": false,
    "EnableOpenTracing": false,
@ -63,6 +64,7 @@
    "PostEditTimeLimit": -1,
    "TimeBetweenUserTypingUpdatesMilliseconds": 5000,
    "EnablePostSearch": true,
+    "EnableFileSearch": true,
    "MinimumHashtagLength": 3,
    "EnableUserTypingMessages": true,
    "EnableChannelViewedMessages": true,
@ -205,6 +207,8 @@
    "DriverName": "local",
    "Directory": "__DATA_PATH__",
    "EnablePublicLink": false,
+    "ExtractContent": false,
+    "ArchiveRecursion": false,
    "PublicLinkSalt": "",
    "InitialFont": "nunito-bold.ttf",
    "AmazonS3AccessKeyId": "",
@ -568,8 +572,8 @@
    "TestBoolFeature": false,
    "CloudDelinquentEmailJobsEnabled": false,
    "CollapsedThreads": false,
-    "CustomUserStatuses": true,
-    "PluginIncidentManagement": "1.4.0"
+    "PluginIncidentManagement": "1.5.2",
+    "FilesSearch": false
  },
  "ImportSettings": {
    "Directory": "./import",
--- a/conf/enterprise.src
+++ b/conf/enterprise.src
@ -1,6 +1,6 @@
-SOURCE_URL=https://releases.mattermost.com/5.34.2/mattermost-enterprise-5.34.2-linux-amd64.tar.gz
-SOURCE_SUM=15111484bd543cc895d91bc74fa500bb23e1bc614526c38acd2c2aaaf5435da5
+SOURCE_URL=https://releases.mattermost.com/5.35.3/mattermost-enterprise-5.35.3-linux-amd64.tar.gz
+SOURCE_SUM=f985c042866232e422522872951ffa9a593cbb4e8a7bce7d13c5ef4842d8dad5
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=mattermost-enterprise-5.34.2-linux-amd64.tar.gz
+SOURCE_FILENAME=mattermost-enterprise-5.35.3-linux-amd64.tar.gz
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@ -1,6 +1,6 @@
-SOURCE_URL=https://releases.mattermost.com/5.34.2/mattermost-team-5.34.2-linux-amd64.tar.gz
-SOURCE_SUM=7346b4ac5132c69c677b4f738a18c6d0969ad4ae466f29d6f02b361878801ec6
+SOURCE_URL=https://releases.mattermost.com/5.35.3/mattermost-team-5.35.3-linux-amd64.tar.gz
+SOURCE_SUM=8b2abdd22ecaa2605fab07e31fd1e96be77d6566e322827411709c231ef82086
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=mattermost-team-5.34.2-linux-amd64.tar.gz
+SOURCE_FILENAME=mattermost-team-5.35.3-linux-amd64.tar.gz
--- a/doc/DISCLAIMER.md
+++ b/doc/DISCLAIMER.md
@ -0,0 +1,17 @@
+## Configuration
+
+* How to configure this app: From an admin panel, a plain file with SSH.
+
+## YunoHost specific features
+
+This package can install the [*Entreprise Edition*](https://docs.mattermost.com/overview/product.html#mattermost-enterprise-edition) or the [*Team Edition*](https://docs.mattermost.com/overview/product.html#mattermost-team-edition).
+
+Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/download/)
+
+## Limitations
+
+* LDAP integration is not supported (see #58)
+
+## Additional information
+
+* This package can by installed on `ARM`, `ARM64` and `x86-64` architecture (only `x86-64` if you choose to install the *Entreprise Edition*).
--- a/doc/DISCLAIMER_fr.md
+++ b/doc/DISCLAIMER_fr.md
@ -0,0 +1,15 @@
+## Configuration
+
+ * Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH.
+
+## Caractéristiques spécifiques YunoHost
+
+Ce paquet peut installer la version [*Entreprise Edition*](https://docs.mattermost.com/overview/product.html#mattermost-enterprise-edition) ou la version [*Team Edition*](https://docs.mattermost.com/overview/product.html#mattermost-team-edition).
+
+## Limitations
+
+* L'intégration LDAP n'est pas gérée (see #58)
+
+## Informations additionnelles
+
+Ce paquet peut être installé sur les architectures `ARM`, `ARM64` et `x86-64` (mais uniquement `x86-64` si vous choisissez d'installer la version *Enterprise Edition*).
--- a/doc/screenshots/screenshot.png
+++ b/doc/screenshots/screenshot.png
--- a/manifest.json
+++ b/manifest.json
@ -6,8 +6,15 @@
        "en": "Open source collaboration platform built for developers",
        "fr": "Plateforme de collaboration open source conçue pour les développeurs"
    },
-    "version": "5.34.2~ynh1",
+    "version": "5.35.3~ynh1",
    "url": "http://www.mattermost.org/",
+    "upstream": {
+        "license": "GPL-3.0-only",
+        "website": "http://www.mattermost.org/",
+        "admindoc": "https://docs.mattermost.com/",
+        "userdoc": "https://yunohost.org/en/app_mattermost",
+        "code": "https://github.com/mattermost/mattermost-server"
+    },
    "license": "GPL-3.0-only",
    "maintainer": {
        "name": "pmorinerie",
@ -19,10 +26,10 @@
        "mysql"
    ],
    "requirements": {
-      "yunohost": ">= 4.1.0"
+        "yunohost": ">= 4.1.0"
    },
    "arguments": {
-        "install" : [
+        "install": [
            {
                "name": "domain",
                "type": "domain",
@ -84,7 +91,10 @@
                    "en": "Use Team Edition for the open source version (ARM, ARM64 and x86-64 support) or Enterprise Edition if you want to use a license (x86-64 support only)",
                    "fr": "Utilisez Team Edition pour la version open source (prise en charge ARM, ARM64 et x86-64) ou Enterprise Edition si vous souhaitez utiliser une licence (prise en charge x86-64 uniquement)"
                },
-                "choices": ["Enterprise", "Team"],
+                "choices": [
+                    "Enterprise",
+                    "Team"
+                ],
                "default": "Team"
            },
            {
@ -94,7 +104,14 @@
                    "en": "Choose the language of the chat for the admin",
                    "fr": "Choissisez la langue utilisée pour l'administrateur"
                },
-                "choices": ["de", "en", "es", "fr", "it", "pt"],
+                "choices": [
+                    "de",
+                    "en",
+                    "es",
+                    "fr",
+                    "it",
+                    "pt"
+                ],
                "default": "en"
            },
            {
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -40,6 +40,7 @@ version=$(ynh_app_setting_get --app=$app --key=version)
 #=================================================
 ynh_script_progression --message="Checking version..." --weight=1

+previous_upstream_version="$(ynh_app_upstream_version --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json")"
 upgrade_type=$(ynh_check_app_version_changed)

 #=================================================
@ -193,6 +194,12 @@ yunohost service add $app --description="Collaboration platform built for develo
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=2

+# A lengthy database migration runs when upgrading from a version < 5.35.
+if dpkg --compare-versions "$previous_upstream_version" lt "5.35.0"
+then
+  ynh_print_warn --message="A database migration will now run. This may take a while..."
+fi
+
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Started Mattermost"