From d8f0ab251c780b1a16d6f24db6778ba931a4b9d8 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Sat, 2 Oct 2021 23:45:01 +0200 Subject: [PATCH 01/19] Upgrade to Matermost 5.39.0 --- README.md | 2 +- README_fr.md | 2 +- conf/arm.src | 6 +++--- conf/arm64.src | 6 +++--- conf/enterprise.src | 6 +++--- conf/x86-64.src | 6 +++--- manifest.json | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 297691a..0c988c1 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Open source collaboration platform built for developers -**Shipped version:** 5.38.2~ynh1 +**Shipped version:** 5.39.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 347ba21..2ede0ba 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Plateforme de collaboration open source conçue pour les développeurs -**Version incluse :** 5.38.2~ynh1 +**Version incluse :** 5.39.0~ynh1 diff --git a/conf/arm.src b/conf/arm.src index 43f44df..2efc2e4 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.38.2/mattermost-v5.38.2-linux-arm.tar.gz -SOURCE_SUM=6e1d4e36c3139c00736e72fe2d96236e45cb84cd66f9d72b3f050c6c186fb2d6f0d949d32e16a2f2e102625d66395314d748a9fffb4bdab4c5d6561a06f6a413 +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.39.0/mattermost-v5.39.0-linux-arm.tar.gz +SOURCE_SUM=c95e52f8977130d5e4a68ddc6b5a1c1e2756f6b40630d003e05cd82f8bed209712e2dad0874f2f92984a3b47b56a114abfecd60d290a91ac36fcb5b70e235fe7 SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-v5.38.2-linux-arm.tar.gz +SOURCE_FILENAME=mattermost-v5.39.0-linux-arm.tar.gz diff --git a/conf/arm64.src b/conf/arm64.src index 218afb7..335e78d 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.38.2/mattermost-v5.38.2-linux-arm64.tar.gz -SOURCE_SUM=e2c95ca30b5604580413231747013eb36a2474298bd0feabdffd7f77e469931b77575ccb010e174ff2a910aeb513a4bcb7a7b8c5775ea2b562b284dcd8064bb2 +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.39.0/mattermost-v5.39.0-linux-arm64.tar.gz +SOURCE_SUM=77ef43e344c6129916cafcd2d13d3a527beb6ed92a81393e7c9765405be4254e1b63df13b1a396e7af23a08900e7c3bef819bcb05b28a14a5673cb861cc48e7c SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-v5.38.2-linux-arm64.tar.gz +SOURCE_FILENAME=mattermost-v5.39.0-linux-arm64.tar.gz diff --git a/conf/enterprise.src b/conf/enterprise.src index e66e2c7..132cb51 100644 --- a/conf/enterprise.src +++ b/conf/enterprise.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://releases.mattermost.com/5.38.2/mattermost-enterprise-5.38.2-linux-amd64.tar.gz -SOURCE_SUM=5d6769cca6aa058547965408baa6937135e08718bc5d1477033df1000e43ec8b +SOURCE_URL=https://releases.mattermost.com/5.39.0/mattermost-enterprise-5.39.0-linux-amd64.tar.gz +SOURCE_SUM=ac0adea65fa8c9a0dcb0effcb4fab2c101b65ac246b205dd5514bfa9f1c22ed4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-enterprise-5.38.2-linux-amd64.tar.gz +SOURCE_FILENAME=mattermost-enterprise-5.39.0-linux-amd64.tar.gz diff --git a/conf/x86-64.src b/conf/x86-64.src index a9c55aa..c328e93 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://releases.mattermost.com/5.38.2/mattermost-team-5.38.2-linux-amd64.tar.gz -SOURCE_SUM=b6f2f6f24017eeca9e40d3bda750047171c5728f12c29564384e1aca764e0bf0 +SOURCE_URL=https://releases.mattermost.com/5.39.0/mattermost-team-5.39.0-linux-amd64.tar.gz +SOURCE_SUM=07175b78b0a6e14601d93ac8363e541eadcf95943338892a80640208211284b9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-team-5.38.2-linux-amd64.tar.gz +SOURCE_FILENAME=mattermost-team-5.39.0-linux-amd64.tar.gz diff --git a/manifest.json b/manifest.json index 6d8ed07..2b27d26 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source collaboration platform built for developers", "fr": "Plateforme de collaboration open source conçue pour les développeurs" }, - "version": "5.38.2~ynh1", + "version": "5.39.0~ynh1", "url": "http://www.mattermost.org/", "upstream": { "license": "GPL-3.0-only", From 5b27b0b5fc7d6f60f42785c602efc5e03419ab2d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 3 Oct 2021 09:52:06 +0200 Subject: [PATCH 02/19] Update config.json --- conf/config.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/config.json b/conf/config.json index 703b910..be7d18d 100644 --- a/conf/config.json +++ b/conf/config.json @@ -513,7 +513,8 @@ "EnableFileDeletion": false, "MessageRetentionDays": 365, "FileRetentionDays": 365, - "DeletionJobStartTime": "02:00" + "DeletionJobStartTime": "02:00", + "BatchSize": 3000 }, "MessageExportSettings": { "EnableExport": false, @@ -552,7 +553,8 @@ "AutomaticPrepackagedPlugins": true, "RequirePluginSignature": false, "MarketplaceUrl": "https://api.integrations.mattermost.com", - "SignaturePublicKeyFiles": [] + "SignaturePublicKeyFiles": [], + "ChimeraOAuthProxyUrl": "" }, "DisplaySettings": { "CustomUrlSchemes": [], @@ -584,7 +586,6 @@ "PluginIncidentManagement": "1.14.3", "PluginApps": "", "PluginFocalboard": "", - "CustomDataRetentionEnabled": false, "TimedDND": false }, "ImportSettings": { From ca434cb757fc02cfb85e51621cedd293cb388e31 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 3 Oct 2021 19:24:16 +0200 Subject: [PATCH 03/19] source for auto-update --- conf/arm.src | 6 +++--- conf/arm64.src | 6 +++--- conf/enterprise.src | 2 +- conf/x86-64.src | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/arm.src b/conf/arm.src index 2efc2e4..3bb5937 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,6 +1,6 @@ SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.39.0/mattermost-v5.39.0-linux-arm.tar.gz -SOURCE_SUM=c95e52f8977130d5e4a68ddc6b5a1c1e2756f6b40630d003e05cd82f8bed209712e2dad0874f2f92984a3b47b56a114abfecd60d290a91ac36fcb5b70e235fe7 -SOURCE_SUM_PRG=sha512sum +SOURCE_SUM=06cf528404a2c096dc69a005654ce9c2fa89301d2f4faf38fa72bd80c05ade1a +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-v5.39.0-linux-arm.tar.gz +SOURCE_FILENAME=mattermost.tar.gz diff --git a/conf/arm64.src b/conf/arm64.src index 335e78d..57db370 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,6 +1,6 @@ SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.39.0/mattermost-v5.39.0-linux-arm64.tar.gz -SOURCE_SUM=77ef43e344c6129916cafcd2d13d3a527beb6ed92a81393e7c9765405be4254e1b63df13b1a396e7af23a08900e7c3bef819bcb05b28a14a5673cb861cc48e7c -SOURCE_SUM_PRG=sha512sum +SOURCE_SUM=53bfd2bc0c7c7996c101c2905f8caced4ac1be53239e654e8c47ad5a1d397d60 +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-v5.39.0-linux-arm64.tar.gz +SOURCE_FILENAME=mattermost.tar.gz diff --git a/conf/enterprise.src b/conf/enterprise.src index 132cb51..6a4ca08 100644 --- a/conf/enterprise.src +++ b/conf/enterprise.src @@ -3,4 +3,4 @@ SOURCE_SUM=ac0adea65fa8c9a0dcb0effcb4fab2c101b65ac246b205dd5514bfa9f1c22ed4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-enterprise-5.39.0-linux-amd64.tar.gz +SOURCE_FILENAME=mattermost.tar.gz diff --git a/conf/x86-64.src b/conf/x86-64.src index c328e93..1286dc2 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -3,4 +3,4 @@ SOURCE_SUM=07175b78b0a6e14601d93ac8363e541eadcf95943338892a80640208211284b9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-team-5.39.0-linux-amd64.tar.gz +SOURCE_FILENAME=mattermost.tar.gz From 7c6811db2d3abb046a93a414709259d5bb444a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 6 Oct 2021 11:02:00 +0200 Subject: [PATCH 04/19] Add descriptions (#283) * Add desriptions --- README.md | 22 +++++++++++++++++++++- README_fr.md | 22 +++++++++++++++++++++- doc/DESCRIPTION.md | 20 ++++++++++++++++++++ doc/DESCRIPTION_fr.md | 20 ++++++++++++++++++++ 4 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DESCRIPTION_fr.md diff --git a/README.md b/README.md index 0c988c1..6a701fd 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,27 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Open source collaboration platform built for developers +## Mattermost Team Edition +A free-to-use, open source, self-hosted alternative to proprietary SaaS messaging. Team Edition is your open source “virtual office”, offering all the core productivity benefits of competing SaaS solutions. It deploys as a single Linux binary with MySQL under an MIT license. + +## Mattermost Enterprise Edition +To explore the benefits of Mattermost’s enterprise features, you can replace the Mattermost Team Edition binary with a Mattermost Enterprise Edition binary. This version supports upgrading to Mattermost Enterprise Edition E10 or E20. + +## Features include: + +- One-to-one and group messaging, file sharing, and unlimited search history +- Native apps for iOS, Android, Windows, Mac, Linux +- Threaded messaging, emoji, and custom emoji +- Tools for custom branding +- Continuous archiving +- Multi-factor authentication +- Highly customizable third-party bots, integrations, and command line tools +- Extensive integration support via webhooks, APIs, drivers, and third-party extensions +- Easily scalable to dozens of users per team +- Runtime profiling data and system monitoring reports +- New features and improvements released regularly +- Multiple languages including U.S. English, Australian English, Bulgarian, Chinese (Simplified and Traditional), Dutch, French, German, Hungarian, Italian, Japanese, Korean, Polish, Brazilian Portuguese, Romanian, Russian, Turkish, Spanish, Swedish, and Ukrainian + **Shipped version:** 5.39.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 2ede0ba..36eba00 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,27 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Plateforme de collaboration open source conçue pour les développeurs +## Mattermost Team Edition +Une alternative gratuite, open source et auto-hébergée à la messagerie SaaS propriétaire. Team Edition est votre « bureau virtuel » open source, offrant tous les principaux avantages de productivité des solutions SaaS concurrentes. + +## Mattermost Entreprise Edition +Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vous pouvez remplacer le binaire Mattermost Team Edition par un binaire Mattermost Enterprise Edition. Cette version prend en charge la mise à niveau vers Mattermost Enterprise Edition E10 ou E20. + +## Les fonctionnalités incluent: + +- Messagerie individuelle et de groupe, partage de fichiers et historique de recherche illimité +- Applications natives pour iOS, Android, Windows, Mac, Linux +- Messagerie, emoji et emoji personnalisés +- Outils pour une image de marque personnalisée +- Archivage continu +- Authentification multi-facteurs +- Bots tiers hautement personnalisables, intégrations et outils de ligne de commande +- Prise en charge étendue de l'intégration via des webhooks, des API, des pilotes et des extensions tierces +- Facilement évolutif à des dizaines d'utilisateurs par équipe +- Données de profilage d'exécution et rapports de surveillance du système +- Nouvelles fonctionnalités et améliorations publiées régulièrement +- Plusieurs langues dont l'anglais américain, l'anglais australien, le bulgare, le chinois (simplifié et traditionnel), le néerlandais, le français, l'allemand, le hongrois, l'italien, le japonais, le coréen, le polonais, le portugais brésilien, le roumain, le russe, le turc, l'espagnol, le suédois et l'ukrainien + **Version incluse :** 5.39.0~ynh1 diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..38c93a3 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1,20 @@ +## Mattermost Team Edition +A free-to-use, open source, self-hosted alternative to proprietary SaaS messaging. Team Edition is your open source “virtual office”, offering all the core productivity benefits of competing SaaS solutions. It deploys as a single Linux binary with MySQL under an MIT license. + +## Mattermost Enterprise Edition +To explore the benefits of Mattermost’s enterprise features, you can replace the Mattermost Team Edition binary with a Mattermost Enterprise Edition binary. This version supports upgrading to Mattermost Enterprise Edition E10 or E20. + +## Features include: + +- One-to-one and group messaging, file sharing, and unlimited search history +- Native apps for iOS, Android, Windows, Mac, Linux +- Threaded messaging, emoji, and custom emoji +- Tools for custom branding +- Continuous archiving +- Multi-factor authentication +- Highly customizable third-party bots, integrations, and command line tools +- Extensive integration support via webhooks, APIs, drivers, and third-party extensions +- Easily scalable to dozens of users per team +- Runtime profiling data and system monitoring reports +- New features and improvements released regularly +- Multiple languages including U.S. English, Australian English, Bulgarian, Chinese (Simplified and Traditional), Dutch, French, German, Hungarian, Italian, Japanese, Korean, Polish, Brazilian Portuguese, Romanian, Russian, Turkish, Spanish, Swedish, and Ukrainian diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..c876146 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,20 @@ +## Mattermost Team Edition +Une alternative gratuite, open source et auto-hébergée à la messagerie SaaS propriétaire. Team Edition est votre « bureau virtuel » open source, offrant tous les principaux avantages de productivité des solutions SaaS concurrentes. + +## Mattermost Entreprise Edition +Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vous pouvez remplacer le binaire Mattermost Team Edition par un binaire Mattermost Enterprise Edition. Cette version prend en charge la mise à niveau vers Mattermost Enterprise Edition E10 ou E20. + +## Les fonctionnalités incluent: + +- Messagerie individuelle et de groupe, partage de fichiers et historique de recherche illimité +- Applications natives pour iOS, Android, Windows, Mac, Linux +- Messagerie, emoji et emoji personnalisés +- Outils pour une image de marque personnalisée +- Archivage continu +- Authentification multi-facteurs +- Bots tiers hautement personnalisables, intégrations et outils de ligne de commande +- Prise en charge étendue de l'intégration via des webhooks, des API, des pilotes et des extensions tierces +- Facilement évolutif à des dizaines d'utilisateurs par équipe +- Données de profilage d'exécution et rapports de surveillance du système +- Nouvelles fonctionnalités et améliorations publiées régulièrement +- Plusieurs langues dont l'anglais américain, l'anglais australien, le bulgare, le chinois (simplifié et traditionnel), le néerlandais, le français, l'allemand, le hongrois, l'italien, le japonais, le coréen, le polonais, le portugais brésilien, le roumain, le russe, le turc, l'espagnol, le suédois et l'ukrainien From ccd9b55f5f479c9755d9de1afb0ddc08602a1a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 6 Oct 2021 11:04:38 +0200 Subject: [PATCH 05/19] Auto update (#277) * Add automatic Action update --- .github/workflows/updater.sh | 154 ++++++++++++++++++++++++++++++++++ .github/workflows/updater.yml | 49 +++++++++++ 2 files changed, 203 insertions(+) create mode 100644 .github/workflows/updater.sh create mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh new file mode 100644 index 0000000..48a4e22 --- /dev/null +++ b/.github/workflows/updater.sh @@ -0,0 +1,154 @@ +#!/bin/bash + +#================================================= +# PACKAGE UPDATING HELPER +#================================================= + +# This script is meant to be run by GitHub Actions +# The YunoHost-Apps organisation offers a template Action to run this script periodically +# Since each app is different, maintainers can adapt its contents so as to perform +# automatic actions when a new upstream release is detected. + +# Remove this exit command when you are ready to run this Action +#exit 1 + +#================================================= +# FETCHING LATEST RELEASE AND ITS ASSETS +#================================================= + +# Fetching information +current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') +repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') +# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) +version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) + +if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then + version=${version:1} +fi + +# x86-64 and enterprise assets are hosted on Mattermost's servers. +assets=() +assets+=("https://releases.mattermost.com/$version/mattermost-team-$version-linux-amd64.tar.gz") +assets+=("https://releases.mattermost.com/$version/mattermost-enterprise-$version-linux-amd64.tar.gz") + +# ARM and ARM64 are published in another repository (with a leading "v" for version tags) +other_repo="SmartHoneybee/ubiquitous-memory" +other_assets=($(curl --silent "https://api.github.com/repos/$other_repo/releases" | jq -r '[ .[] | select(.tag_name=="'v$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) + +# Setting up the environment variables +echo "Current version: $current_version" +echo "Latest release from upstream: $version" +echo "VERSION=$version" >> $GITHUB_ENV +# For the time being, let's assume the script will fail +echo "PROCEED=false" >> $GITHUB_ENV + +# Proceed only if the retrieved version is greater than the current one +if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then + echo "::warning ::No new version available" + exit 0 +# Proceed only if a PR for this new version does not already exist +elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then + echo "::warning ::A branch already exists for this update" + exit 0 +fi +# Proceed only if all the binaries have been found +if (( ${#other_assets[@]} == 0 )); then + echo "::warning ::$other_repo has not released anything for v$version" + exit 0 +else + assets+=( ${other_assets[@]} ) +fi + +# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) +echo "${#assets[@]} available asset(s)" + +#================================================= +# UPDATE SOURCE FILES +#================================================= + +# Here we use the $assets variable to get the resources published in the upstream release. +# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. + +# Let's loop over the array of assets URLs +for asset_url in ${assets[@]}; do + +echo "Handling asset at $asset_url" + +# Assign the asset to a source file in conf/ directory +# Here we base the source file name upon a unique keyword in the assets url (admin vs. update) +# Leave $src empty to ignore the asset +case $asset_url in + *"mattermost-"*"-linux-arm.tar.gz") + src="arm" + ;; + *"mattermost-"*"-linux-arm64.tar.gz") + src="arm64" + ;; + *"mattermost-team-"*"-linux-amd64.tar.gz") + src="x86-64" + ;; + *"mattermost-enterprise-"*"-linux-amd64.tar.gz") + src="enterprise" + ;; + *) + src="" + ;; +esac + +# If $src is not empty, let's process the asset +if [ ! -z "$src" ]; then + +# Create the temporary directory +tempdir="$(mktemp -d)" + +# Download sources and calculate checksum +filename=${asset_url##*/} +curl --silent -4 -L $asset_url -o "$tempdir/$filename" +checksum=$(sha256sum "$tempdir/$filename" | head -c 64) + +# Delete temporary directory +rm -rf $tempdir + +# Get extension +if [[ $filename == *.tar.gz ]]; then + extension=tar.gz +else + extension=${filename##*.} +fi + +# Rewrite source file +cat < conf/$src.src +SOURCE_URL=$asset_url +SOURCE_SUM=$checksum +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=$extension +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME=mattermost.tar.gz +EOT +echo "... conf/$src.src updated" + +else +echo "... asset ignored" +fi + +done + +#================================================= +# SPECIFIC UPDATE STEPS +#================================================= + +# Any action on the app's source code can be done. +# The GitHub Action workflow takes care of committing all changes after this script ends. + +#================================================= +# GENERIC FINALIZATION +#================================================= + +# Replace new version in manifest +echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json + +# No need to update the README, yunohost-bot takes care of it + +# The Action will proceed only if the PROCEED environment variable is set to true +echo "PROCEED=true" >> $GITHUB_ENV +exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml new file mode 100644 index 0000000..fd6ed60 --- /dev/null +++ b/.github/workflows/updater.yml @@ -0,0 +1,49 @@ +# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. +# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. +# This file should be enough by itself, but feel free to tune it to your needs. +# It calls updater.sh, which is where you should put the app-specific update steps. +name: Check for new upstream releases +on: + # Allow to manually trigger the workflow + workflow_dispatch: + # Run it every day at 6:00 UTC + schedule: + - cron: '0 6 * * *' +jobs: + updater: + runs-on: ubuntu-latest + steps: + - name: Fetch the source code + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: Run the updater script + id: run_updater + run: | + # Setting up Git user + git config --global user.name 'yunohost-bot' + git config --global user.email 'yunohost-bot@users.noreply.github.com' + # Run the updater script + /bin/bash .github/workflows/updater.sh + - name: Commit changes + id: commit + if: ${{ env.PROCEED == 'true' }} + run: | + git commit -am "Upgrade to v$VERSION" + - name: Create Pull Request + id: cpr + if: ${{ env.PROCEED == 'true' }} + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: Update to version ${{ env.VERSION }} + committer: 'yunohost-bot ' + author: 'yunohost-bot ' + signoff: false + branch: ci-auto-update-v${{ env.VERSION }} + base: testing + delete-branch: true + title: 'Upgrade to version ${{ env.VERSION }}' + body: | + Upgrade to v${{ env.VERSION }} + draft: false From 5c6ce08058aae90a77790960fffa48b5fb133cda Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 13 Oct 2021 06:07:35 +0000 Subject: [PATCH 06/19] Upgrade to v6.0.0 --- conf/arm.src | 4 ++-- conf/arm64.src | 4 ++-- conf/enterprise.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/arm.src b/conf/arm.src index 3bb5937..29474d5 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.39.0/mattermost-v5.39.0-linux-arm.tar.gz -SOURCE_SUM=06cf528404a2c096dc69a005654ce9c2fa89301d2f4faf38fa72bd80c05ade1a +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.0.0/mattermost-v6.0.0-linux-arm.tar.gz +SOURCE_SUM=2c81c829bbf7fad85c5a9a23306ac22c9548c4df3030e2ecbe9db86fd169713a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index 57db370..e9e244b 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.39.0/mattermost-v5.39.0-linux-arm64.tar.gz -SOURCE_SUM=53bfd2bc0c7c7996c101c2905f8caced4ac1be53239e654e8c47ad5a1d397d60 +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.0.0/mattermost-v6.0.0-linux-arm64.tar.gz +SOURCE_SUM=c2cae744230a5571c4ba8af79da1ae747651974c8fe16372819d184a95c4a246 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/enterprise.src b/conf/enterprise.src index 6a4ca08..984eb42 100644 --- a/conf/enterprise.src +++ b/conf/enterprise.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.mattermost.com/5.39.0/mattermost-enterprise-5.39.0-linux-amd64.tar.gz -SOURCE_SUM=ac0adea65fa8c9a0dcb0effcb4fab2c101b65ac246b205dd5514bfa9f1c22ed4 +SOURCE_URL=https://releases.mattermost.com/6.0.0/mattermost-enterprise-6.0.0-linux-amd64.tar.gz +SOURCE_SUM=4fef15ff88765fd8413f497b894066525950ab30d93d5f183c048b88fc6fd40a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/x86-64.src b/conf/x86-64.src index 1286dc2..3083e5d 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.mattermost.com/5.39.0/mattermost-team-5.39.0-linux-amd64.tar.gz -SOURCE_SUM=07175b78b0a6e14601d93ac8363e541eadcf95943338892a80640208211284b9 +SOURCE_URL=https://releases.mattermost.com/6.0.0/mattermost-team-6.0.0-linux-amd64.tar.gz +SOURCE_SUM=b3d9caf30da8957e9faeb0001685fcf1067c5a4e370ea2160a236b8208f2a065 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 2b27d26..7a2c5e7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source collaboration platform built for developers", "fr": "Plateforme de collaboration open source conçue pour les développeurs" }, - "version": "5.39.0~ynh1", + "version": "6.0.0~ynh1", "url": "http://www.mattermost.org/", "upstream": { "license": "GPL-3.0-only", From 315aaae5d73f054d1fea5994b398b32b1e2c4dc6 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 13 Oct 2021 06:07:42 +0000 Subject: [PATCH 07/19] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a701fd..15d1da4 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ To explore the benefits of Mattermost’s enterprise features, you can replace t - Multiple languages including U.S. English, Australian English, Bulgarian, Chinese (Simplified and Traditional), Dutch, French, German, Hungarian, Italian, Japanese, Korean, Polish, Brazilian Portuguese, Romanian, Russian, Turkish, Spanish, Swedish, and Ukrainian -**Shipped version:** 5.39.0~ynh1 +**Shipped version:** 6.0.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 36eba00..7c1459b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -33,7 +33,7 @@ Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vou - Plusieurs langues dont l'anglais américain, l'anglais australien, le bulgare, le chinois (simplifié et traditionnel), le néerlandais, le français, l'allemand, le hongrois, l'italien, le japonais, le coréen, le polonais, le portugais brésilien, le roumain, le russe, le turc, l'espagnol, le suédois et l'ukrainien -**Version incluse :** 5.39.0~ynh1 +**Version incluse :** 6.0.0~ynh1 From 15351182e718a598da0c7329b386ba02c94c12e8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 13 Oct 2021 09:40:10 +0200 Subject: [PATCH 08/19] Update config.json --- conf/config.json | 82 +++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 47 deletions(-) diff --git a/conf/config.json b/conf/config.json index be7d18d..c5a1403 100644 --- a/conf/config.json +++ b/conf/config.json @@ -27,8 +27,8 @@ "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "GoogleDeveloperKey": "", - "EnableOnlyAdminIntegrations": true, "EnableLinkPreviews": true, + "EnablePermalinkPreviews": true, "RestrictLinkPreviews": "", "EnableTesting": false, "EnableDeveloper": false, @@ -54,13 +54,10 @@ "WebsocketPort": 80, "WebserverMode": "gzip", "EnableGifPicker": true, - "GfycatApiKey": "2_KtH_W5", - "GfycatApiSecret": "3wLVZPiswc3DnaiaFoLkDvB4X0IV6CpMkj4tf2inJRsBY6-FnkT08zGmppWFgeof", + "GfycatAPIKey": "2_KtH_W5", + "GfycatAPISecret": "3wLVZPiswc3DnaiaFoLkDvB4X0IV6CpMkj4tf2inJRsBY6-FnkT08zGmppWFgeof", "EnableCustomEmoji": true, "EnableEmojiPicker": true, - "RestrictCustomEmojiCreation": "all", - "RestrictPostDelete": "all", - "AllowEditPost": "always", "PostEditTimeLimit": -1, "TimeBetweenUserTypingUpdatesMilliseconds": 5000, "EnablePostSearch": true, @@ -71,19 +68,14 @@ "EnableUserStatuses": true, "ExperimentalEnableAuthenticationTransfer": true, "ClusterLogTimeoutMilliseconds": 2000, - "CloseUnusedDirectMessages": false, "EnablePreviewFeatures": true, "EnableTutorial": true, + "EnableOnboardingFlow": true, "ExperimentalEnableDefaultChannelLeaveJoinMessages": true, "ExperimentalGroupUnreadChannels": "disabled", - "ExperimentalChannelOrganization": false, - "ImageProxyType": "", - "ImageProxyURL": "", - "ImageProxyOptions": "", "EnableAPITeamDeletion": false, "EnableAPIUserDeletion": false, "ExperimentalEnableHardenedMode": false, - "DisableLegacyMFA": true, "ExperimentalStrictCSRFEnforcement": false, "EnableEmailInvitations": false, "DisableBotsWhenOwnerIsDeactivated": true, @@ -100,13 +92,11 @@ "ThreadAutoFollow": true, "CollapsedThreads": "disabled", "ManagedResourcePaths": "", - "EnableLegacySidebar": false, "EnableReliableWebSockets": false }, "TeamSettings": { "SiteName": "Mattermost", "MaxUsersPerTeam": 50, - "EnableTeamCreation": true, "EnableUserCreation": true, "EnableOpenServer": false, "EnableUserDeactivation": false, @@ -116,15 +106,6 @@ "CustomBrandText": "", "CustomDescriptionText": "", "RestrictDirectMessage": "any", - "RestrictTeamInvite": "all", - "RestrictPublicChannelManagement": "all", - "RestrictPrivateChannelManagement": "all", - "RestrictPublicChannelCreation": "all", - "RestrictPrivateChannelCreation": "all", - "RestrictPublicChannelDeletion": "all", - "RestrictPrivateChannelDeletion": "all", - "RestrictPrivateChannelManageMembers": "all", - "EnableXToLeaveChannelsFromLHS": false, "UserStatusAwayTimeout": 300, "MaxChannelsPerTeam": 2000, "MaxNotificationsPerChannel": 1000, @@ -132,8 +113,6 @@ "TeammateNameDisplay": "username", "ExperimentalViewArchivedChannels": true, "ExperimentalEnableAutomaticReplies": false, - "ExperimentalHideTownSquareinLHS": false, - "ExperimentalTownSquareIsReadOnly": false, "LockTeammateNameDisplay": false, "ExperimentalPrimaryTeam": "", "ExperimentalDefaultChannels": [] @@ -208,6 +187,7 @@ "EnableMobileUpload": true, "EnableMobileDownload": true, "MaxFileSize": 104857600, + "MaxImageResolution": 33177600, "DriverName": "local", "Directory": "__DATA_PATH__", "EnablePublicLink": false, @@ -274,8 +254,8 @@ "SupportSettings": { "TermsOfServiceLink": "https://mattermost.com/terms-of-service/", "PrivacyPolicyLink": "https://mattermost.com/privacy-policy/", - "AboutLink": "https://docs.mattermost.com/overview/product.html", - "HelpLink": "https://academy.mattermost.com/", + "AboutLink": "https://about.mattermost.com/default-about/", + "HelpLink": "https://about.mattermost.com/default-help/", "ReportAProblemLink": "https://about.mattermost.com/default-report-a-problem/", "SupportEmail": "", "CustomTermsOfServiceEnabled": false, @@ -307,7 +287,7 @@ "Scope": "", "AuthEndpoint": "", "TokenEndpoint": "", - "UserApiEndpoint": "", + "UserAPIEndpoint": "", "DiscoveryEndpoint": "", "ButtonText": "", "ButtonColor": "" @@ -319,7 +299,7 @@ "Scope": "profile email", "AuthEndpoint": "https://accounts.google.com/o/oauth2/v2/auth", "TokenEndpoint": "https://www.googleapis.com/oauth2/v4/token", - "UserApiEndpoint": "https://people.googleapis.com/v1/people/me?personFields=names,emailAddresses,nicknames,metadata", + "UserAPIEndpoint": "https://people.googleapis.com/v1/people/me?personFields=names,emailAddresses,nicknames,metadata", "DiscoveryEndpoint": "", "ButtonText": "", "ButtonColor": "" @@ -331,7 +311,7 @@ "Scope": "User.Read", "AuthEndpoint": "https://login.microsoftonline.com/common/oauth2/v2.0/authorize", "TokenEndpoint": "https://login.microsoftonline.com/common/oauth2/v2.0/token", - "UserApiEndpoint": "https://graph.microsoft.com/v1.0/me", + "UserAPIEndpoint": "https://graph.microsoft.com/v1.0/me", "DiscoveryEndpoint": "", "DirectoryId": "" }, @@ -342,7 +322,7 @@ "Scope": "profile openid email", "AuthEndpoint": "", "TokenEndpoint": "", - "UserApiEndpoint": "", + "UserAPIEndpoint": "", "DiscoveryEndpoint": "", "ButtonText": "", "ButtonColor": "#145DBF" @@ -403,9 +383,9 @@ "Verify": true, "Encrypt": true, "SignRequest": false, - "IdpUrl": "", - "IdpDescriptorUrl": "", - "IdpMetadataUrl": "", + "IdpURL": "", + "IdpDescriptorURL": "", + "IdpMetadataURL": "", "ServiceProviderIdentifier": "", "AssertionConsumerServiceURL": "", "SignatureAlgorithm": "RSAwithSHA1", @@ -447,8 +427,7 @@ "NetworkInterface": "", "BindAddress": "", "AdvertiseAddress": "", - "UseIpAddress": true, - "UseExperimentalGossip": true, + "UseIPAddress": true, "EnableGossipCompression": true, "EnableExperimentalGossipEncryption": false, "ReadOnlyConfig": true, @@ -479,7 +458,7 @@ "MaxUsersForStatistics": 2500 }, "ElasticsearchSettings": { - "ConnectionUrl": "http://localhost:9200", + "ConnectionURL": "http://localhost:9200", "Username": "elastic", "Password": "changeme", "EnableIndexing": false, @@ -525,8 +504,8 @@ "DownloadExportResults": false, "GlobalRelaySettings": { "CustomerType": "A9", - "SmtpUsername": "", - "SmtpPassword": "", + "SMTPUsername": "", + "SMTPPassword": "", "EmailAddress": "", "SMTPServerTimeout": 1800 } @@ -538,7 +517,7 @@ "PluginSettings": { "Enable": true, "EnableUploads": false, - "AllowInsecureDownloadUrl": false, + "AllowInsecureDownloadURL": false, "EnableHealthCheck": true, "Directory": "./plugins", "ClientDirectory": "./client/plugins", @@ -546,18 +525,24 @@ "PluginStates": { "com.mattermost.nps": { "Enable": true + }, + "focalboard": { + "Enable": true + }, + "playbooks": { + "Enable": true } }, "EnableMarketplace": true, "EnableRemoteMarketplace": true, "AutomaticPrepackagedPlugins": true, "RequirePluginSignature": false, - "MarketplaceUrl": "https://api.integrations.mattermost.com", + "MarketplaceURL": "https://api.integrations.mattermost.com", "SignaturePublicKeyFiles": [], - "ChimeraOAuthProxyUrl": "" + "ChimeraOAuthProxyURL": "" }, "DisplaySettings": { - "CustomUrlSchemes": [], + "CustomURLSchemes": [], "ExperimentalTimezone": true }, "GuestAccountsSettings": { @@ -573,8 +558,8 @@ "RemoteImageProxyOptions": "" }, "CloudSettings": { - "CWSUrl": "https://customers.mattermost.com", - "CWSAPIUrl": "https://portal.internal.prod.cloud.mattermost.com" + "CWSURL": "https://customers.mattermost.com", + "CWSAPIURL": "https://portal.internal.prod.cloud.mattermost.com" }, "FeatureFlags": { "TestFeature": "off", @@ -583,10 +568,13 @@ "CollapsedThreads": true, "EnableRemoteClusterService": false, "AppsEnabled": false, - "PluginIncidentManagement": "1.14.3", + "PluginPlaybooks": "", "PluginApps": "", "PluginFocalboard": "", - "TimedDND": false + "TimedDND": false, + "PermalinkPreviews": true, + "GlobalHeader": true, + "AddChannelButton": "by_team_name" }, "ImportSettings": { "Directory": "./import", From 88bb812d93cb60ae75c19410c2dfc396c43760a0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 19 Oct 2021 06:07:26 +0000 Subject: [PATCH 09/19] Upgrade to v6.0.1 --- conf/arm.src | 4 ++-- conf/arm64.src | 4 ++-- conf/enterprise.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/arm.src b/conf/arm.src index 3bb5937..d76dbe9 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.39.0/mattermost-v5.39.0-linux-arm.tar.gz -SOURCE_SUM=06cf528404a2c096dc69a005654ce9c2fa89301d2f4faf38fa72bd80c05ade1a +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.0.1/mattermost-v6.0.1-linux-arm.tar.gz +SOURCE_SUM=57a1cccec531580f1bf616ffe85e90a6ae32969172c07459da29e36ac5bec0eb SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index 57db370..1accfb3 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.39.0/mattermost-v5.39.0-linux-arm64.tar.gz -SOURCE_SUM=53bfd2bc0c7c7996c101c2905f8caced4ac1be53239e654e8c47ad5a1d397d60 +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.0.1/mattermost-v6.0.1-linux-arm64.tar.gz +SOURCE_SUM=981c06bb763dcd7192e831895e7df76d0bbfb0b272fb40e7ba037d07392dead1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/enterprise.src b/conf/enterprise.src index 6a4ca08..06dbe0f 100644 --- a/conf/enterprise.src +++ b/conf/enterprise.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.mattermost.com/5.39.0/mattermost-enterprise-5.39.0-linux-amd64.tar.gz -SOURCE_SUM=ac0adea65fa8c9a0dcb0effcb4fab2c101b65ac246b205dd5514bfa9f1c22ed4 +SOURCE_URL=https://releases.mattermost.com/6.0.1/mattermost-enterprise-6.0.1-linux-amd64.tar.gz +SOURCE_SUM=e05ad0c7cfd63b1846924c6bce0f6330c4952b31babfec197a98d0ded9d9287e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/x86-64.src b/conf/x86-64.src index 1286dc2..d39b7c0 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.mattermost.com/5.39.0/mattermost-team-5.39.0-linux-amd64.tar.gz -SOURCE_SUM=07175b78b0a6e14601d93ac8363e541eadcf95943338892a80640208211284b9 +SOURCE_URL=https://releases.mattermost.com/6.0.1/mattermost-team-6.0.1-linux-amd64.tar.gz +SOURCE_SUM=d4f4009221cadf376baecc165550d525784f6142ba2f09f8fc9c4f2f5b2116d6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 2b27d26..d6c55ed 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source collaboration platform built for developers", "fr": "Plateforme de collaboration open source conçue pour les développeurs" }, - "version": "5.39.0~ynh1", + "version": "6.0.1~ynh1", "url": "http://www.mattermost.org/", "upstream": { "license": "GPL-3.0-only", From 25f1ec6746fbee09b33cc17f6ad7481472af2657 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 19 Oct 2021 06:07:32 +0000 Subject: [PATCH 10/19] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a701fd..5424618 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ To explore the benefits of Mattermost’s enterprise features, you can replace t - Multiple languages including U.S. English, Australian English, Bulgarian, Chinese (Simplified and Traditional), Dutch, French, German, Hungarian, Italian, Japanese, Korean, Polish, Brazilian Portuguese, Romanian, Russian, Turkish, Spanish, Swedish, and Ukrainian -**Shipped version:** 5.39.0~ynh1 +**Shipped version:** 6.0.1~ynh1 diff --git a/README_fr.md b/README_fr.md index 36eba00..502f0aa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -33,7 +33,7 @@ Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vou - Plusieurs langues dont l'anglais américain, l'anglais australien, le bulgare, le chinois (simplifié et traditionnel), le néerlandais, le français, l'allemand, le hongrois, l'italien, le japonais, le coréen, le polonais, le portugais brésilien, le roumain, le russe, le turc, l'espagnol, le suédois et l'ukrainien -**Version incluse :** 5.39.0~ynh1 +**Version incluse :** 6.0.1~ynh1 From 3e56004e1fdaef4d3db0ac44ff8ac4a2998abac9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 30 Oct 2021 06:07:05 +0000 Subject: [PATCH 11/19] Upgrade to v6.0.2 --- conf/arm.src | 4 ++-- conf/arm64.src | 4 ++-- conf/enterprise.src | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/arm.src b/conf/arm.src index 3bb5937..29a19dc 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.39.0/mattermost-v5.39.0-linux-arm.tar.gz -SOURCE_SUM=06cf528404a2c096dc69a005654ce9c2fa89301d2f4faf38fa72bd80c05ade1a +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.0.2/mattermost-v6.0.2-linux-arm.tar.gz +SOURCE_SUM=465788c52826143f4c5e3198dce08088f61d5511431b2d5272a63ee618757e04 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index 57db370..c6ff023 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.39.0/mattermost-v5.39.0-linux-arm64.tar.gz -SOURCE_SUM=53bfd2bc0c7c7996c101c2905f8caced4ac1be53239e654e8c47ad5a1d397d60 +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.0.2/mattermost-v6.0.2-linux-arm64.tar.gz +SOURCE_SUM=53debd6dda971aac8a199f0a56ccbabc324a5bcafaa4a3038425bbcdd766e599 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/enterprise.src b/conf/enterprise.src index 6a4ca08..70a77d0 100644 --- a/conf/enterprise.src +++ b/conf/enterprise.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.mattermost.com/5.39.0/mattermost-enterprise-5.39.0-linux-amd64.tar.gz -SOURCE_SUM=ac0adea65fa8c9a0dcb0effcb4fab2c101b65ac246b205dd5514bfa9f1c22ed4 +SOURCE_URL=https://releases.mattermost.com/6.0.2/mattermost-enterprise-6.0.2-linux-amd64.tar.gz +SOURCE_SUM=4580a435a350c9401d50972e720a47e2551eba889a51b976991c6b906a2ac1fd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/x86-64.src b/conf/x86-64.src index 1286dc2..a2894d0 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.mattermost.com/5.39.0/mattermost-team-5.39.0-linux-amd64.tar.gz -SOURCE_SUM=07175b78b0a6e14601d93ac8363e541eadcf95943338892a80640208211284b9 +SOURCE_URL=https://releases.mattermost.com/6.0.2/mattermost-team-6.0.2-linux-amd64.tar.gz +SOURCE_SUM=56a2148e8cac5c40ac700fed4cd52c875c512fa0dce5e54f1414af7513f0cb8e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 2b27d26..68b0c95 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source collaboration platform built for developers", "fr": "Plateforme de collaboration open source conçue pour les développeurs" }, - "version": "5.39.0~ynh1", + "version": "6.0.2~ynh1", "url": "http://www.mattermost.org/", "upstream": { "license": "GPL-3.0-only", From 00c58d50ebd23990ec9040c7941a1910ceaf9762 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 30 Oct 2021 06:07:09 +0000 Subject: [PATCH 12/19] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a701fd..0455614 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ To explore the benefits of Mattermost’s enterprise features, you can replace t - Multiple languages including U.S. English, Australian English, Bulgarian, Chinese (Simplified and Traditional), Dutch, French, German, Hungarian, Italian, Japanese, Korean, Polish, Brazilian Portuguese, Romanian, Russian, Turkish, Spanish, Swedish, and Ukrainian -**Shipped version:** 5.39.0~ynh1 +**Shipped version:** 6.0.2~ynh1 diff --git a/README_fr.md b/README_fr.md index 36eba00..841d939 100644 --- a/README_fr.md +++ b/README_fr.md @@ -33,7 +33,7 @@ Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vou - Plusieurs langues dont l'anglais américain, l'anglais australien, le bulgare, le chinois (simplifié et traditionnel), le néerlandais, le français, l'allemand, le hongrois, l'italien, le japonais, le coréen, le polonais, le portugais brésilien, le roumain, le russe, le turc, l'espagnol, le suédois et l'ukrainien -**Version incluse :** 5.39.0~ynh1 +**Version incluse :** 6.0.2~ynh1 From 940589206b8694fbed96f05c6905d01ebd704802 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Sat, 30 Oct 2021 12:32:53 +0000 Subject: [PATCH 13/19] install: replace bin/mattermost by bin/mmctl `mmctl` is supposed to authenticate as one of the admin users. But since this is the first user we're creating, there are no admin yet. So in order to create the first user, we: 1. enable mmctl's "local mode", which connects to the Mattermost server through a socket (rather than through the authenticated API), 2. create the first user and team, 3. disable the "local mode". --- conf/config.json | 2 +- scripts/install | 31 ++++++++++++++++++------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/conf/config.json b/conf/config.json index c5a1403..7cd2878 100644 --- a/conf/config.json +++ b/conf/config.json @@ -83,7 +83,7 @@ "EnableSVGs": false, "EnableLatex": false, "EnableAPIChannelDeletion": false, - "EnableLocalMode": false, + "EnableLocalMode": true, "LocalModeSocketLocation": "/var/tmp/mattermost_local.socket", "EnableAWSMetering": false, "SplitKey": "", diff --git a/scripts/install b/scripts/install index 2ef3c9b..13b51d2 100644 --- a/scripts/install +++ b/scripts/install @@ -163,19 +163,6 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=2 # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# CREATE ADMIN AND FIRST TEAM -#================================================= - -team_name=$(echo "$team_display_name" | iconv -f utf8 -t ascii//TRANSLIT//IGNORE | sed -e 's/[^[:alnum:]]/-/g' | tr -s '-' | tr A-Z a-z) - -pushd "$final_path" - ynh_exec_warn_less ynh_exec_as $app bin/mattermost user create --username "$admin" --email "$email" --password "$password" --locale "$language" --system_admin - ynh_exec_warn_less ynh_exec_as $app bin/mattermost user verify "$admin" - ynh_exec_warn_less ynh_exec_as $app bin/mattermost team create --name "$team_name" --display_name "$team_display_name" --email "$email" - ynh_exec_warn_less ynh_exec_as $app bin/mattermost team add "$team_name" "$admin" -popd - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= @@ -191,6 +178,24 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Started Mattermost" +#================================================= +# CREATE ADMIN AND FIRST TEAM +#================================================= +ynh_script_progression --message="Create the first administrator and team..." --weight=1 + +team_name=$(echo "$team_display_name" | iconv -f utf8 -t ascii//TRANSLIT//IGNORE | sed -e 's/[^[:alnum:]]/-/g' | tr -s '-' | tr A-Z a-z) + +pushd "$final_path" + ynh_exec_warn_less ynh_exec_as $app bin/mmctl user create --local --username "$admin" --email "$email" --password "$password" --locale "$language" --system_admin + ynh_exec_warn_less ynh_exec_as $app bin/mmctl user verify --local "$admin" + ynh_exec_warn_less ynh_exec_as $app bin/mmctl team create --local --name "$team_name" --display_name "$team_display_name" --email "$email" + ynh_exec_warn_less ynh_exec_as $app bin/mmctl team add --local "$team_name" "$admin" +popd + +# Now that the first user is created, disable mmctl passwordless access +ynh_replace_string '"EnableLocalMode": true' '"EnableLocalMode": false' "$final_path/config/config.json" +ynh_systemd_action --service_name=$app --action=restart --log_path=systemd --line_match="Started Mattermost" + #================================================= # SETUP SSOWAT #================================================= From 09cc4fbeb142e6d3b147022ba8cc519d1a58eef0 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Sun, 31 Oct 2021 13:05:13 +0100 Subject: [PATCH 14/19] upgrade: warn about 6.0 lengthy database migrations --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 00d02f1..867c172 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -185,8 +185,8 @@ 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.38. -if dpkg --compare-versions "$previous_upstream_version" lt "5.38.0" +# A lengthy database migration runs when upgrading from a version < 6.0. +if dpkg --compare-versions "$previous_upstream_version" lt "6.0.0" then ynh_print_warn --message="Lengthy database migrations will now run. This may take a while..." fi From 7a416d63797449e937d79237842ed2d6cc0c786b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 31 Oct 2021 15:44:24 +0100 Subject: [PATCH 15/19] Remove superfluous values --- manifest.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/manifest.json b/manifest.json index 68b0c95..fb6e74a 100644 --- a/manifest.json +++ b/manifest.json @@ -32,8 +32,7 @@ "install": [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", @@ -52,13 +51,11 @@ }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "password", - "type": "password", - "example": "Choose a password" + "type": "password" }, { "name": "version", From 0bb5458e66d9612726912b22f19ae0b9c75c6b53 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Mon, 1 Nov 2021 10:38:59 +0100 Subject: [PATCH 16/19] scripts: use newer option name instead of deprecated one --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 13b51d2..bda2635 100644 --- a/scripts/install +++ b/scripts/install @@ -186,7 +186,7 @@ ynh_script_progression --message="Create the first administrator and team..." -- team_name=$(echo "$team_display_name" | iconv -f utf8 -t ascii//TRANSLIT//IGNORE | sed -e 's/[^[:alnum:]]/-/g' | tr -s '-' | tr A-Z a-z) pushd "$final_path" - ynh_exec_warn_less ynh_exec_as $app bin/mmctl user create --local --username "$admin" --email "$email" --password "$password" --locale "$language" --system_admin + ynh_exec_warn_less ynh_exec_as $app bin/mmctl user create --local --username "$admin" --email "$email" --password "$password" --locale "$language" --system-admin ynh_exec_warn_less ynh_exec_as $app bin/mmctl user verify --local "$admin" ynh_exec_warn_less ynh_exec_as $app bin/mmctl team create --local --name "$team_name" --display_name "$team_display_name" --email "$email" ynh_exec_warn_less ynh_exec_as $app bin/mmctl team add --local "$team_name" "$admin" From b3647e3db5f8b106e71dc7a963b344c45d25a544 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Mon, 1 Nov 2021 10:24:00 +0000 Subject: [PATCH 17/19] config: store the socket file in a writable location On Yunhost `/var/tmp` is only writable by root. --- conf/config.json | 2 +- conf/systemd.service | 1 + scripts/install | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/conf/config.json b/conf/config.json index 7cd2878..8fc3d81 100644 --- a/conf/config.json +++ b/conf/config.json @@ -84,7 +84,7 @@ "EnableLatex": false, "EnableAPIChannelDeletion": false, "EnableLocalMode": true, - "LocalModeSocketLocation": "/var/tmp/mattermost_local.socket", + "LocalModeSocketLocation": "__LOCAL_SOCKET_PATH__", "EnableAWSMetering": false, "SplitKey": "", "FeatureFlagSyncIntervalSeconds": 30, diff --git a/conf/systemd.service b/conf/systemd.service index 8cea61d..b00e554 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -11,6 +11,7 @@ TimeoutStartSec=3600 Restart=always RestartSec=10 WorkingDirectory=__FINALPATH__ +RuntimeDirectory=__APP__ User=__APP__ Group=__APP__ LimitNOFILE=49152 diff --git a/scripts/install b/scripts/install index bda2635..68099e0 100644 --- a/scripts/install +++ b/scripts/install @@ -144,6 +144,7 @@ ynh_script_progression --message="Modifying a config file..." --weight=3 smtp_user_pwd=$(ynh_string_random --length=24) url=https://$domain$path_url +local_socket_path="/var/run/${app}/mattermost_local.socket" ynh_add_config --template="../conf/config.json" --destination="$final_path/config/config.json" @@ -186,10 +187,13 @@ ynh_script_progression --message="Create the first administrator and team..." -- team_name=$(echo "$team_display_name" | iconv -f utf8 -t ascii//TRANSLIT//IGNORE | sed -e 's/[^[:alnum:]]/-/g' | tr -s '-' | tr A-Z a-z) pushd "$final_path" - ynh_exec_warn_less ynh_exec_as $app bin/mmctl user create --local --username "$admin" --email "$email" --password "$password" --locale "$language" --system-admin - ynh_exec_warn_less ynh_exec_as $app bin/mmctl user verify --local "$admin" - ynh_exec_warn_less ynh_exec_as $app bin/mmctl team create --local --name "$team_name" --display_name "$team_display_name" --email "$email" - ynh_exec_warn_less ynh_exec_as $app bin/mmctl team add --local "$team_name" "$admin" + export MMCTL_LOCAL=true + export MMCTL_LOCAL_SOCKET_PATH="$local_socket_path" + + ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl user create --username "$admin" --email "$email" --password "$password" --locale "$language" --system-admin + ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl user verify "$admin" + ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl team create --name "$team_name" --display_name "$team_display_name" --email "$email" + ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl team add "$team_name" "$admin" popd # Now that the first user is created, disable mmctl passwordless access From f983391fb790e5dc04cf716ed689d04f57565e94 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Mon, 1 Nov 2021 13:23:45 +0100 Subject: [PATCH 18/19] scripts: create and confirm the first user in the same step --- scripts/install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 68099e0..be1b366 100644 --- a/scripts/install +++ b/scripts/install @@ -190,8 +190,7 @@ pushd "$final_path" export MMCTL_LOCAL=true export MMCTL_LOCAL_SOCKET_PATH="$local_socket_path" - ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl user create --username "$admin" --email "$email" --password "$password" --locale "$language" --system-admin - ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl user verify "$admin" + ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl user create --username "$admin" --email "$email" --password "$password" --locale "$language" --email-verified --system-admin ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl team create --name "$team_name" --display_name "$team_display_name" --email "$email" ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl team add "$team_name" "$admin" popd From 5af7f2183fd4503729014139acd60a851d41e25c Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Mon, 1 Nov 2021 13:23:54 +0100 Subject: [PATCH 19/19] scripts: fix the syntax for adding a user to a team --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index be1b366..47c8fcb 100644 --- a/scripts/install +++ b/scripts/install @@ -192,7 +192,7 @@ pushd "$final_path" ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl user create --username "$admin" --email "$email" --password "$password" --locale "$language" --email-verified --system-admin ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl team create --name "$team_name" --display_name "$team_display_name" --email "$email" - ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl team add "$team_name" "$admin" + ynh_exec_warn_less sudo --preserve-env -u $app bin/mmctl team users add "$team_name" "$admin" popd # Now that the first user is created, disable mmctl passwordless access