From 70e4e44c16cd236a62eb53e071bddbe45258f2b0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Jun 2021 09:50:55 +0200 Subject: [PATCH 1/3] Fix linter warnings --- manifest.json | 20 -------------------- scripts/_common.sh | 15 --------------- 2 files changed, 35 deletions(-) diff --git a/manifest.json b/manifest.json index 3f3ebb5..dbc707e 100644 --- a/manifest.json +++ b/manifest.json @@ -33,29 +33,17 @@ { "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 -} - From a80f28440af45f823cdb6813b51bdceac8c85746 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Jun 2021 10:32:28 +0200 Subject: [PATCH 2/3] Update config.json --- conf/config.json | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/conf/config.json b/conf/config.json index f1fdf70..cbc737c 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,20 @@ "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 + "EnableRemoteClusterService": false, + "AppsEnabled": false, + "PluginIncidentManagement": "1.12.0", + "PluginApps": "", + "PluginFocalboard": "", + "CustomDataRetentionEnabled": false }, "ImportSettings": { "Directory": "./import", From 30bbd7ee9a25d92d28bf16c23d85d22ac4c04b8c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Jun 2021 14:40:19 +0200 Subject: [PATCH 3/3] Bump version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index dbc707e..394f722 100644 --- a/manifest.json +++ b/manifest.json @@ -26,7 +26,7 @@ "mysql" ], "requirements": { - "yunohost": ">= 4.1.0" + "yunohost": ">= 4.2.0" }, "arguments": { "install": [