From 68f21737c2435274d988352392b86bde6775db95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 28 Feb 2024 22:47:44 +0100 Subject: [PATCH 1/5] Update manifest.toml --- manifest.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest.toml b/manifest.toml index 237869c..2464f45 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Mattermost" description.en = "Open source collaboration platform built for developers" description.fr = "Plateforme de collaboration open source conçue pour les développeurs" -version = "9.4.2~ynh2" +version = "9.5.1~ynh1" maintainers = ["pmorinerie"] @@ -76,18 +76,18 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://releases.mattermost.com/9.4.2/mattermost-team-9.4.2-linux-amd64.tar.gz" - amd64.sha256 = "61627ab1fb5f987756edf8b4f5c07f9e6d4937c62f27babea0532e5a1fa41ce7" - arm64.url = "https://releases.mattermost.com/9.4.2/mattermost-team-9.4.2-linux-arm64.tar.gz" - arm64.sha256 = "f6801a236c573595ac56fed97e636de72789f98e0b1c71b9ff01dfca354a1a9f" - armhf.url = "https://github.com/remiheens/mattermost-docker-arm/releases/download/v9.4.2/mattermost-v9.4.2-linux-arm.tar.gz" - armhf.sha256 = "d2e3e52b1555eefd3f3b15cf3a322508d944a64a1bda9d101798988e4033212e" + amd64.url = "https://releases.mattermost.com/9.5.1/mattermost-team-9.5.1-linux-amd64.tar.gz" + amd64.sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + arm64.url = "https://releases.mattermost.com/9.5.1/mattermost-team-9.5.1-linux-arm64.tar.gz" + arm64.sha256 = "85c5dd41000146b5c02a5877e3cd2174dd859f131474f24ad618e0f082b6f351" + armhf.url = "https://github.com/remiheens/mattermost-docker-arm/releases/download/v9.5.1/mattermost-v9.5.1-linux-arm.tar.gz" + armhf.sha256 = "1b235b3bb2511df5e8f43320d9b78b2263056873f4cab0d425ab82c40c390b12" [resources.sources.enterprise] - amd64.url = "https://releases.mattermost.com/9.4.2/mattermost-enterprise-9.4.2-linux-amd64.tar.gz" - amd64.sha256 = "7bfd596a880a162aff351e447a5df97acf826405a9d98335a41ca574db6326e7" - arm64.url = "https://releases.mattermost.com/9.4.2/mattermost-enterprise-9.4.2-linux-arm64.tar.gz" - arm64.sha256 = "57e8cfcbf89ef56d27ed18f751db3ceeb1f18d62ab33694a67d7b86a9d3d1faf" + amd64.url = "https://releases.mattermost.com/9.5.1/mattermost-enterprise-9.5.1-linux-amd64.tar.gz" + amd64.sha256 = "177d8d5ae94a521a321cf0a60828a1e876fdf96da2b85fccc72f544ab829d693" + arm64.url = "https://releases.mattermost.com/9.5.1/mattermost-enterprise-9.5.1-linux-arm64.tar.gz" + arm64.sha256 = "685a0fb6a2111cd27f1d77e37c0586aafeb592106fc21ae9dab346f34bea5f56" [resources.system_user] allow_email = true From 1b402c42c5f6c13b7067734531a5ed750e8e54ae Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 28 Feb 2024 21:47:49 +0000 Subject: [PATCH 2/5] 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 28219bf..39fdc41 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Shipped version:** 9.4.2~ynh2 +**Shipped version:** 9.5.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 363e182..63fd7e2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -42,7 +42,7 @@ Ce paquet peut installer la version [*Entreprise Edition*](https://docs.mattermo - Données de profilage d'exécution et rapports de surveillance du système -**Version incluse :** 9.4.2~ynh2 +**Version incluse :** 9.5.1~ynh1 ## Captures d’écran From 8b9e7f3a3f2a791098678a3dd2ca1e0637e58d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 28 Feb 2024 22:51:51 +0100 Subject: [PATCH 3/5] Update config.json --- conf/config.json | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/conf/config.json b/conf/config.json index 6da8d90..3177d2b 100644 --- a/conf/config.json +++ b/conf/config.json @@ -24,6 +24,7 @@ "EnableIncomingWebhooks": true, "EnableOutgoingWebhooks": true, "EnableCommands": true, + "OutgoingIntegrationRequestsTimeout": 30, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "GoogleDeveloperKey": "", @@ -108,7 +109,8 @@ "SelfHostedPurchase": true, "AllowSyncedDrafts": true, "UniqueEmojiReactionLimitPerPost": 50, - "RefreshPostStatsRunTime": "00:00" + "RefreshPostStatsRunTime": "00:00", + "MaximumPayloadSizeBytes": 100000 }, "TeamSettings": { "SiteName": "Mattermost", @@ -538,7 +540,9 @@ "EnableFileDeletion": false, "EnableBoardsDeletion": false, "MessageRetentionDays": 365, + "MessageRetentionHours": 0, "FileRetentionDays": 365, + "FileRetentionHours": 0, "BoardsRetentionDays": 365, "DeletionJobStartTime": "02:00", "BatchSize": 3000, @@ -632,10 +636,12 @@ "DeprecateCloudFree": false, "CloudReverseTrial": false, "EnableExportDirectDownload": false, + "MoveThreadsEnabled": false, "StreamlinedMarketplace": true, "CloudIPFiltering": false, "ConsumePostHook": false, - "CloudAnnualRenewals": false + "CloudAnnualRenewals": false, + "OutgoingOAuthConnections": false }, "ImportSettings": { "Directory": "./import", @@ -644,5 +650,14 @@ "ExportSettings": { "Directory": "./export", "RetentionDays": 30 + }, + "WranglerSettings": { + "PermittedWranglerRoles": [], + "AllowedEmailDomain": [], + "MoveThreadMaxCount": 100, + "MoveThreadToAnotherTeamEnable": false, + "MoveThreadFromPrivateChannelEnable": false, + "MoveThreadFromDirectMessageChannelEnable": false, + "MoveThreadFromGroupMessageChannelEnable": false } } From 17dae27a8e077108913c324be172b1a78aba3fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 1 Mar 2024 19:24:06 +0100 Subject: [PATCH 4/5] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2464f45..59d4bba 100644 --- a/manifest.toml +++ b/manifest.toml @@ -77,7 +77,7 @@ ram.runtime = "50M" [resources.sources.main] amd64.url = "https://releases.mattermost.com/9.5.1/mattermost-team-9.5.1-linux-amd64.tar.gz" - amd64.sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + amd64.sha256 = "17e73b98a6b874b90a4da7ac5b7cead9d0892ec82d066f692c2aefb639cf658e" arm64.url = "https://releases.mattermost.com/9.5.1/mattermost-team-9.5.1-linux-arm64.tar.gz" arm64.sha256 = "85c5dd41000146b5c02a5877e3cd2174dd859f131474f24ad618e0f082b6f351" armhf.url = "https://github.com/remiheens/mattermost-docker-arm/releases/download/v9.5.1/mattermost-v9.5.1-linux-arm.tar.gz" From 07941ce975b500f34f6f54060ead4b25fb16f0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 9 Mar 2024 11:00:54 +0100 Subject: [PATCH 5/5] cleaning --- manifest.toml | 18 +++++++++--------- scripts/upgrade | 48 +++++++++++++++++++----------------------------- 2 files changed, 28 insertions(+), 38 deletions(-) diff --git a/manifest.toml b/manifest.toml index 59d4bba..3131115 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Mattermost" description.en = "Open source collaboration platform built for developers" description.fr = "Plateforme de collaboration open source conçue pour les développeurs" -version = "9.5.1~ynh1" +version = "9.5.2~ynh1" maintainers = ["pmorinerie"] @@ -76,18 +76,18 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://releases.mattermost.com/9.5.1/mattermost-team-9.5.1-linux-amd64.tar.gz" - amd64.sha256 = "17e73b98a6b874b90a4da7ac5b7cead9d0892ec82d066f692c2aefb639cf658e" - arm64.url = "https://releases.mattermost.com/9.5.1/mattermost-team-9.5.1-linux-arm64.tar.gz" - arm64.sha256 = "85c5dd41000146b5c02a5877e3cd2174dd859f131474f24ad618e0f082b6f351" + amd64.url = "https://releases.mattermost.com/9.5.2/mattermost-team-9.5.2-linux-amd64.tar.gz" + amd64.sha256 = "bfa870bb2c592671878af7e320f95d8a93f0df10377d7c70651390a0fabbbd7a" + arm64.url = "https://releases.mattermost.com/9.5.2/mattermost-team-9.5.2-linux-arm64.tar.gz" + arm64.sha256 = "dd5f206d39b3d3249f7f9736f45825d9d91fd1c368b5323e4885157196b98861" armhf.url = "https://github.com/remiheens/mattermost-docker-arm/releases/download/v9.5.1/mattermost-v9.5.1-linux-arm.tar.gz" armhf.sha256 = "1b235b3bb2511df5e8f43320d9b78b2263056873f4cab0d425ab82c40c390b12" [resources.sources.enterprise] - amd64.url = "https://releases.mattermost.com/9.5.1/mattermost-enterprise-9.5.1-linux-amd64.tar.gz" - amd64.sha256 = "177d8d5ae94a521a321cf0a60828a1e876fdf96da2b85fccc72f544ab829d693" - arm64.url = "https://releases.mattermost.com/9.5.1/mattermost-enterprise-9.5.1-linux-arm64.tar.gz" - arm64.sha256 = "685a0fb6a2111cd27f1d77e37c0586aafeb592106fc21ae9dab346f34bea5f56" + amd64.url = "https://releases.mattermost.com/9.5.2/mattermost-enterprise-9.5.2-linux-amd64.tar.gz" + amd64.sha256 = "a208a8c1b3581e8f4d4d02c083538a5e9f29575667ee43dc651f6e91a2afa4a0" + arm64.url = "https://releases.mattermost.com/9.5.2/mattermost-enterprise-9.5.2-linux-arm64.tar.gz" + arm64.sha256 = "99a09048434cb75f6d304329924ee9fda6bdfe11aa293777a08f528d7fbba12f" [resources.system_user] allow_email = true diff --git a/scripts/upgrade b/scripts/upgrade index 8285423..bb135c3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -56,35 +50,31 @@ ynh_systemd_action --service_name=$app --action=stop --log_path=systemd #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=2 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=2 +# Create a temporary directory +tmpdir="$(mktemp -d)" - # Create a temporary directory - tmpdir="$(mktemp -d)" +# Backup the config file and local plugins in the temp dir +cp -a "$install_dir/config/config.json" "$tmpdir/config.json" +cp -ar "$install_dir/plugins" "$tmpdir/plugins" - # Backup the config file and local plugins in the temp dir - cp -a "$install_dir/config/config.json" "$tmpdir/config.json" - cp -ar "$install_dir/plugins" "$tmpdir/plugins" +# Remove the app directory securely +ynh_secure_remove --file="$install_dir" - # Remove the app directory securely - ynh_secure_remove --file="$install_dir" - - if [ "$version" = "Enterprise" ]; then - ynh_setup_source --dest_dir="$install_dir" --source_id="enterprise" - elif [ "$version" = "Team" ]; then - ynh_setup_source --dest_dir="$install_dir" --source_id="main" - fi - - # Copy the admin saved settings and plugins from tmp directory to final path - cp -a "$tmpdir/config.json" "$install_dir/config/config.json" - cp -ar --no-clobber "$tmpdir/plugins" "$install_dir/" - - # Remove the tmp directory securely - ynh_secure_remove --file="$tmpdir" +if [ "$version" = "Enterprise" ]; then + ynh_setup_source --dest_dir="$install_dir" --source_id="enterprise" +elif [ "$version" = "Team" ]; then + ynh_setup_source --dest_dir="$install_dir" --source_id="main" fi +# Copy the admin saved settings and plugins from tmp directory to final path +cp -a "$tmpdir/config.json" "$install_dir/config/config.json" +cp -ar --no-clobber "$tmpdir/plugins" "$install_dir/" + +# Remove the tmp directory securely +ynh_secure_remove --file="$tmpdir" + chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"