diff --git a/README.md b/README.md index 651eaf9..3f01e45 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.36.1~ynh1 +**Shipped version:** 5.37.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 41cc77e..975a797 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.36.1~ynh1 +**Version incluse :** 5.37.0~ynh1 diff --git a/conf/arm.src b/conf/arm.src index 5c508ed..faa8370 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.36.1/mattermost-v5.36.1-linux-arm.tar.gz -SOURCE_SUM=ce3c13a9bdcc1b0dbb1e6b87b565658d88f1317235a3388505adcd0e999272ebd1be15fca5a8427a17cafb05232159daebfaa539dad2d28458e2639047c11fdc +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.37.0/mattermost-v5.37.0-linux-arm.tar.gz +SOURCE_SUM=0b72bfdb48ca67fafb804ec01b179a417d885a26a2b7d115015bc0a349b2a4a7c227839ebc039ae7c17fe328751a54c227574275fdd27593204affb0b7f151ec SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-v5.36.1-linux-arm.tar.gz +SOURCE_FILENAME=mattermost-v5.37.0-linux-arm.tar.gz diff --git a/conf/arm64.src b/conf/arm64.src index 5b20ad1..0863d73 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.36.1/mattermost-v5.36.1-linux-arm64.tar.gz -SOURCE_SUM=1937a729650c4767c136c1b57d5abca9f76753ac9de71ac72e58f935aec8ea6e79e60b37ff2ea8e641dcca5a360afb346660b855fed3b31cc80e7ac795809734 +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v5.37.0/mattermost-v5.37.0-linux-arm64.tar.gz +SOURCE_SUM=94f40473fbfa653255ade341349663c9049c0e04602406b66b4836614e5a98dc6e6454b43146cc59cd1ccbdef7ca4166e1ac9b1e95f9312d5e7a1374f407b0d2 SOURCE_SUM_PRG=sha512sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-v5.36.1-linux-arm64.tar.gz +SOURCE_FILENAME=mattermost-v5.37.0-linux-arm64.tar.gz diff --git a/conf/config.json b/conf/config.json index f1fdf70..703b910 100644 --- a/conf/config.json +++ b/conf/config.json @@ -20,14 +20,14 @@ "IdleTimeout": 60, "MaximumLoginAttempts": 10, "GoroutineHealthThreshold": -1, - "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, "EnableIncomingWebhooks": true, "EnableOutgoingWebhooks": true, "EnableCommands": true, - "EnableOnlyAdminIntegrations": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, + "GoogleDeveloperKey": "", + "EnableOnlyAdminIntegrations": true, "EnableLinkPreviews": true, "RestrictLinkPreviews": "", "EnableTesting": false, @@ -53,11 +53,11 @@ "WebsocketSecurePort": 443, "WebsocketPort": 80, "WebserverMode": "gzip", - "EnableCustomEmoji": true, - "EnableEmojiPicker": true, "EnableGifPicker": true, "GfycatApiKey": "2_KtH_W5", "GfycatApiSecret": "3wLVZPiswc3DnaiaFoLkDvB4X0IV6CpMkj4tf2inJRsBY6-FnkT08zGmppWFgeof", + "EnableCustomEmoji": true, + "EnableEmojiPicker": true, "RestrictCustomEmojiCreation": "all", "RestrictPostDelete": "all", "AllowEditPost": "always", @@ -100,7 +100,8 @@ "ThreadAutoFollow": true, "CollapsedThreads": "disabled", "ManagedResourcePaths": "", - "EnableLegacySidebar": false + "EnableLegacySidebar": false, + "EnableReliableWebSockets": false }, "TeamSettings": { "SiteName": "Mattermost", @@ -157,12 +158,14 @@ "Trace": false, "AtRestEncryptKey": "", "QueryTimeout": 30, - "DisableDatabaseSearch": false + "DisableDatabaseSearch": false, + "ReplicaLagSettings": [] }, "LogSettings": { "EnableConsole": true, "ConsoleLevel": "INFO", "ConsoleJson": true, + "EnableColor": false, "EnableFile": true, "FileLevel": "INFO", "FileJson": true, @@ -186,6 +189,7 @@ "EnableConsole": false, "ConsoleLevel": "INFO", "ConsoleJson": true, + "EnableColor": false, "EnableFile": true, "FileLevel": "INFO", "FileJson": true, @@ -268,12 +272,12 @@ "ShowFullName": true }, "SupportSettings": { - "TermsOfServiceLink": "https://about.mattermost.com/default-terms/", - "PrivacyPolicyLink": "https://about.mattermost.com/default-privacy-policy/", - "AboutLink": "https://about.mattermost.com/default-about/", - "HelpLink": "https://about.mattermost.com/default-help/", + "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/", "ReportAProblemLink": "https://about.mattermost.com/default-report-a-problem/", - "SupportEmail": "feedback@mattermost.com", + "SupportEmail": "", "CustomTermsOfServiceEnabled": false, "CustomTermsOfServiceReAcceptancePeriod": 365, "EnableAskCommunityLink": true @@ -383,7 +387,8 @@ "ComplianceSettings": { "Enable": false, "Directory": "./data/", - "EnableDaily": false + "EnableDaily": false, + "BatchSize": 30000 }, "LocalizationSettings": { "DefaultServerLocale": "__LANGUAGE__", @@ -467,7 +472,8 @@ "UseNewSAMLLibrary": false, "CloudUserLimit": 0, "CloudBilling": false, - "EnableSharedChannels": false + "EnableSharedChannels": false, + "EnableRemoteClusterService": false }, "AnalyticsSettings": { "MaxUsersForStatistics": 2500 @@ -565,15 +571,21 @@ "RemoteImageProxyOptions": "" }, "CloudSettings": { - "CWSUrl": "https://customers.mattermost.com" + "CWSUrl": "https://customers.mattermost.com", + "CWSAPIUrl": "https://portal.internal.prod.cloud.mattermost.com" }, "FeatureFlags": { "TestFeature": "off", "TestBoolFeature": false, "CloudDelinquentEmailJobsEnabled": false, - "CollapsedThreads": false, - "PluginIncidentManagement": "1.5.2", - "FilesSearch": false + "CollapsedThreads": true, + "EnableRemoteClusterService": false, + "AppsEnabled": false, + "PluginIncidentManagement": "1.14.3", + "PluginApps": "", + "PluginFocalboard": "", + "CustomDataRetentionEnabled": false, + "TimedDND": false }, "ImportSettings": { "Directory": "./import", diff --git a/conf/enterprise.src b/conf/enterprise.src index d152159..e93efc7 100644 --- a/conf/enterprise.src +++ b/conf/enterprise.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://releases.mattermost.com/5.36.1/mattermost-enterprise-5.36.1-linux-amd64.tar.gz -SOURCE_SUM=991d669acec1ba216c0e9065d797bf1b4e9512ea1f0e94a25833b2d6ac058dc4 +SOURCE_URL=https://releases.mattermost.com/5.37.0/mattermost-enterprise-5.37.0-linux-amd64.tar.gz +SOURCE_SUM=ff1f194047e4a395795b6a6b7de664ad0a0095d7762685745f842130154e97f5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-enterprise-5.36.1-linux-amd64.tar.gz +SOURCE_FILENAME=mattermost-enterprise-5.37.0-linux-amd64.tar.gz diff --git a/conf/x86-64.src b/conf/x86-64.src index 4661958..911a410 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://releases.mattermost.com/5.36.1/mattermost-team-5.36.1-linux-amd64.tar.gz -SOURCE_SUM=002a1e0e9370b8bfc9aad0bb0938a3864796dc83bc370f1750f780cd6439bb69 +SOURCE_URL=https://releases.mattermost.com/5.37.0/mattermost-team-5.37.0-linux-amd64.tar.gz +SOURCE_SUM=c689235e7b4829ab5ce7614eeb3c4d9a18cc5cd4456baf3f18f4363787369aa8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=mattermost-team-5.36.1-linux-amd64.tar.gz +SOURCE_FILENAME=mattermost-team-5.37.0-linux-amd64.tar.gz diff --git a/manifest.json b/manifest.json index 3f3ebb5..8c528d4 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.36.1~ynh1", + "version": "5.37.0~ynh1", "url": "http://www.mattermost.org/", "upstream": { "license": "GPL-3.0-only", @@ -26,36 +26,24 @@ "mysql" ], "requirements": { - "yunohost": ">= 4.1.0" + "yunohost": ">= 4.2.0" }, "arguments": { "install": [ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain for Mattermost", - "fr": "Choisissez un domaine pour Mattermost" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Mattermost", - "fr": "Choisissez un chemin pour Mattermost" - }, "example": "/mattermost", "default": "/chat" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, "help": { "en": "If enabled, Mattermost will be accessible by the user without a YunoHost account. This can be changed later via the webadmin.", "fr": "Si cette case est cochée, Mattermost sera accessible par l'utilisateur sans compte YunoHost. Vous pourrez changer ceci plus tard via l’interface d’administration." @@ -65,19 +53,11 @@ { "name": "admin", "type": "user", - "ask": { - "en": "Choose an admin user", - "fr": "Choisissez l'administrateur" - }, "example": "johndoe" }, { "name": "password", "type": "password", - "ask": { - "en": "Set the administrator password", - "fr": "Définissez le mot de passe administrateur" - }, "example": "Choose a password" }, { diff --git a/scripts/_common.sh b/scripts/_common.sh index 7916409..4dd6f6b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -38,21 +38,6 @@ ynh_detect_arch(){ echo $architecture } - #================================================= # FUTURE OFFICIAL HELPERS #================================================= - -# Execute a command as another user -# usage: ynh_exec_as USER COMMAND [ARG ...] -ynh_exec_as() { - local USER=$1 - shift 1 - - if [[ $USER = $(whoami) ]]; then - eval "$@" - else - sudo -u "$USER" "$@" - fi -} -