From 5c6ce08058aae90a77790960fffa48b5fb133cda Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 13 Oct 2021 06:07:35 +0000 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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