From abdc52f1078d8aaed7d20061c9d10de6f43306bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 25 Jun 2024 14:40:03 +0200 Subject: [PATCH 01/13] update to upstream --- conf/config.json | 13 ++++++++----- manifest.toml | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/conf/config.json b/conf/config.json index a2a759b..bfb1208 100644 --- a/conf/config.json +++ b/conf/config.json @@ -107,7 +107,6 @@ "CollapsedThreads": "disabled", "ManagedResourcePaths": "", "EnableCustomGroups": true, - "SelfHostedPurchase": true, "AllowSyncedDrafts": true, "UniqueEmojiReactionLimitPerPost": 50, "RefreshPostStatsRunTime": "00:00", @@ -483,7 +482,9 @@ "MetricsSettings": { "Enable": false, "BlockProfileRate": 0, - "ListenAddress": ":8067" + "ListenAddress": ":8067", + "EnableClientMetrics": true, + "EnableNotificationMetrics": true }, "ExperimentalSettings": { "ClientSideCertEnable": false, @@ -494,7 +495,8 @@ "EnableRemoteClusterService": false, "DisableAppBar": false, "DisableRefetchingOnBrowserFocus": false, - "DelayChannelAutocomplete": false + "DelayChannelAutocomplete": false, + "DisableWakeUpReconnectHandler": false }, "AnalyticsSettings": { "MaxUsersForStatistics": 2500 @@ -629,7 +631,6 @@ "PermalinkPreviews": false, "CallsEnabled": true, "NormalizeLdapDNs": false, - "PostPriority": false, "WysiwygEditor": false, "OnboardingTourTips": true, "DeprecateCloudFree": false, @@ -643,7 +644,9 @@ "CloudDedicatedExportUI": false, "ChannelBookmarks": false, "WebSocketEventScope": false, - "NotificationMonitoring": true + "NotificationMonitoring": true, + "ExperimentalAuditSettingsSystemConsoleUI": false, + "ClientMetrics": false }, "ImportSettings": { "Directory": "./import", diff --git a/manifest.toml b/manifest.toml index 0c83bb0..2323b69 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.8.1~ynh1" +version = "9.9.0~ynh1" maintainers = ["pmorinerie"] @@ -76,18 +76,18 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://releases.mattermost.com/9.8.1/mattermost-team-9.8.1-linux-amd64.tar.gz" - amd64.sha256 = "02097cd7aff6cf55575b54f74f168cfb07b9335bb3079e50419166df312daf53" - arm64.url = "https://releases.mattermost.com/9.8.1/mattermost-team-9.8.1-linux-arm64.tar.gz" - arm64.sha256 = "210d29abbdbd3946bd541cb678fb3e11ac404fc301caadee730de23eb62d5115" - armhf.url = "https://github.com/remiheens/mattermost-docker-arm/releases/download/v9.8.1/mattermost-v9.8.1-linux-arm.tar.gz" - armhf.sha256 = "692ee44e352fde7f3a6412066a441c9436b693d25b990a0d3af552c6a158c148" + amd64.url = "https://releases.mattermost.com/9.9.0/mattermost-team-9.9.0-linux-amd64.tar.gz" + amd64.sha256 = "83e982f193f3f81cd276fa78c6786b407a671b15f9f0cb927cc44883f231dbdf" + arm64.url = "https://releases.mattermost.com/9.9.0/mattermost-team-9.9.0-linux-arm64.tar.gz" + arm64.sha256 = "f3afb214fd6ae1e1c7895d6c10d88812286e3851fc7da8a5ee995cb5843fa222" + armhf.url = "https://github.com/remiheens/mattermost-docker-arm/releases/download/v9.9.0/mattermost-v9.9.0-linux-arm.tar.gz" + armhf.sha256 = "612b2a0bca1b1755291d5723dcf617be6d0848474b58727151d8cbf2d5431826" [resources.sources.enterprise] - amd64.url = "https://releases.mattermost.com/9.8.1/mattermost-enterprise-9.8.1-linux-amd64.tar.gz" - amd64.sha256 = "b8b09673a731eb6cda52688383e0a5c5148453a7972a75322db522f3daee5248" - arm64.url = "https://releases.mattermost.com/9.8.1/mattermost-enterprise-9.8.1-linux-arm64.tar.gz" - arm64.sha256 = "d51a60f1fca305bec466bee6de565ffba91e778354818142ddd63cec521516f2" + amd64.url = "https://releases.mattermost.com/9.9.0/mattermost-enterprise-9.9.0-linux-amd64.tar.gz" + amd64.sha256 = "8808ddaa46476924d2087b39a45e287b3120e41a124a63618aaa7ffce5b69d3b" + arm64.url = "https://releases.mattermost.com/9.9.0/mattermost-enterprise-9.9.0-linux-arm64.tar.gz" + arm64.sha256 = "a1e516e5f2fcaffa8ff19f70a71c1f735642f5dc0cb066e7142e50d4943081d8" [resources.system_user] allow_email = true From 3e213dc87efe82ff9b384d77bb283b3fcbc2ef2d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 25 Jun 2024 12:40:08 +0000 Subject: [PATCH 02/13] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9bb213a..51a0e03 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.8.1~ynh1 +**Shipped version:** 9.9.0~ynh1 ## Screenshots diff --git a/README_es.md b/README_es.md index f02bd12..060bc62 100644 --- a/README_es.md +++ b/README_es.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Versión actual:** 9.8.1~ynh1 +**Versión actual:** 9.9.0~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index c3a3679..0142152 100644 --- a/README_eu.md +++ b/README_eu.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Paketatutako bertsioa:** 9.8.1~ynh1 +**Paketatutako bertsioa:** 9.9.0~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 93378dd..b58f71f 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.8.1~ynh1 +**Version incluse :** 9.9.0~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 1385e93..3989924 100644 --- a/README_gl.md +++ b/README_gl.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Versión proporcionada:** 9.8.1~ynh1 +**Versión proporcionada:** 9.9.0~ynh1 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index c6995cb..12d5930 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**分发版本：** 9.8.1~ynh1 +**分发版本：** 9.9.0~ynh1 ## 截图 From 4e13df8196921c261e966b80c473641b68459dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 25 Jun 2024 14:42:58 +0200 Subject: [PATCH 03/13] #484 --- scripts/remove | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/remove b/scripts/remove index 70d4055..22e3942 100755 --- a/scripts/remove +++ b/scripts/remove @@ -32,9 +32,6 @@ ynh_remove_logrotate # Remove the dedicated NGINX config ynh_remove_nginx_config -# Remove the log file -ynh_secure_remove --file="/var/log/$app" - # If the user attempted to upgrade from an older MariaDB-based version, but the upgrade failed, # the 'remove' action will automatically remove the PostgreSQL database – but doesn't know # that a MariaDB database is still lying around. From 2451cb60bf1ae302d3acd5949b47ae968fdc603c Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 4 Jul 2024 07:29:00 +0200 Subject: [PATCH 04/13] Update nginx.conf (#485) --- conf/nginx.conf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 5dee3de..bbba431 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,12 +11,18 @@ location ~ ^__PATH__/api/v[0-9]+/(users/)?websocket$ { proxy_set_header X-Frame-Options SAMEORIGIN; proxy_buffers 256 16k; proxy_buffer_size 16k; - proxy_read_timeout 600s; + client_body_timeout 60s; + send_timeout 300s; + lingering_timeout 5s; + proxy_connect_timeout 90s; + proxy_send_timeout 300s; + proxy_read_timeout 90s; + proxy_http_version 1.1; proxy_pass http://127.0.0.1:__PORT__; } location __PATH__/ { - client_max_body_size 50M; + client_max_body_size 100M; proxy_set_header Connection ""; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -26,12 +32,6 @@ location __PATH__/ { proxy_buffers 256 16k; proxy_buffer_size 16k; proxy_read_timeout 600s; - # Disable the proxy cache, because the proxy_cache_path directive - # cannot be embeded in a `server` block. - #proxy_cache mattermost_cache; - #proxy_cache_revalidate on; - #proxy_cache_min_uses 2; - #proxy_cache_use_stale timeout; - #proxy_cache_lock on; + proxy_http_version 1.1; proxy_pass http://127.0.0.1:__PORT__; } From dcb50ec6e119bda45798497649895aa941c75683 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 4 Jul 2024 05:29:04 +0000 Subject: [PATCH 05/13] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 51a0e03..040a3f5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Mattermost for YunoHost -[![Integration level](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![Working status](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/mattermost.svg)](https://ci-apps.yunohost.org/ci/apps/mattermost/) ![Working status](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) [![Install Mattermost with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mattermost) diff --git a/README_es.md b/README_es.md index 060bc62..99b30e8 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Mattermost para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/mattermost.svg)](https://ci-apps.yunohost.org/ci/apps/mattermost/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) [![Instalar Mattermost con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mattermost) diff --git a/README_eu.md b/README_eu.md index 0142152..c0ed782 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Mattermost YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/mattermost.svg)](https://ci-apps.yunohost.org/ci/apps/mattermost/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) [![Instalatu Mattermost YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mattermost) diff --git a/README_fr.md b/README_fr.md index b58f71f..fb190d3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Mattermost pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/mattermost.svg)](https://ci-apps.yunohost.org/ci/apps/mattermost/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) [![Installer Mattermost avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mattermost) diff --git a/README_gl.md b/README_gl.md index 3989924..9609d55 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Mattermost para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/mattermost.svg)](https://ci-apps.yunohost.org/ci/apps/mattermost/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) [![Instalar Mattermost con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mattermost) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 12d5930..3161012 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Mattermost -[![集成程度](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![工作状态](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/mattermost.svg)](https://ci-apps.yunohost.org/ci/apps/mattermost/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) [![使用 YunoHost 安装 Mattermost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mattermost) From a986570569cd7834ea4cd7271b84c5f38c8ad1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:53:33 +0200 Subject: [PATCH 06/13] Update manifest.toml --- manifest.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2323b69..782ceec 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.9.0~ynh1" +version = "9.9.1~ynh1" maintainers = ["pmorinerie"] @@ -76,18 +76,18 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://releases.mattermost.com/9.9.0/mattermost-team-9.9.0-linux-amd64.tar.gz" - amd64.sha256 = "83e982f193f3f81cd276fa78c6786b407a671b15f9f0cb927cc44883f231dbdf" - arm64.url = "https://releases.mattermost.com/9.9.0/mattermost-team-9.9.0-linux-arm64.tar.gz" - arm64.sha256 = "f3afb214fd6ae1e1c7895d6c10d88812286e3851fc7da8a5ee995cb5843fa222" + amd64.url = "https://releases.mattermost.com/9.9.1/mattermost-team-9.9.1-linux-amd64.tar.gz" + amd64.sha256 = "24e862acf3a46ad52db7f24581357c4623faa391c1148d5ca7ed17c1228d081c" + arm64.url = "https://releases.mattermost.com/9.9.1/mattermost-team-9.9.1-linux-arm64.tar.gz" + arm64.sha256 = "bebed15f1b1d8f96de247406c1519eced1dea0f2f419e4579c94eba32bf1759b" armhf.url = "https://github.com/remiheens/mattermost-docker-arm/releases/download/v9.9.0/mattermost-v9.9.0-linux-arm.tar.gz" armhf.sha256 = "612b2a0bca1b1755291d5723dcf617be6d0848474b58727151d8cbf2d5431826" [resources.sources.enterprise] - amd64.url = "https://releases.mattermost.com/9.9.0/mattermost-enterprise-9.9.0-linux-amd64.tar.gz" - amd64.sha256 = "8808ddaa46476924d2087b39a45e287b3120e41a124a63618aaa7ffce5b69d3b" - arm64.url = "https://releases.mattermost.com/9.9.0/mattermost-enterprise-9.9.0-linux-arm64.tar.gz" - arm64.sha256 = "a1e516e5f2fcaffa8ff19f70a71c1f735642f5dc0cb066e7142e50d4943081d8" + amd64.url = "https://releases.mattermost.com/9.9.1/mattermost-enterprise-9.9.1-linux-amd64.tar.gz" + amd64.sha256 = "d2303a5e54eb7308081022f72c9c15c2e8206966c7c9048d2911dc71a3972493" + arm64.url = "https://releases.mattermost.com/9.9.1/mattermost-enterprise-9.9.1-linux-arm64.tar.gz" + arm64.sha256 = "48b5e3ca8197d61682973a86b123b60066b997a580c443096d2da1a0e28caa86" [resources.system_user] allow_email = true From 1c5f0ebf4faf715f22424ae6fa1c32fab58c958d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 4 Jul 2024 09:53:38 +0000 Subject: [PATCH 07/13] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 040a3f5..58e9c93 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.9.0~ynh1 +**Shipped version:** 9.9.1~ynh1 ## Screenshots diff --git a/README_es.md b/README_es.md index 99b30e8..473f087 100644 --- a/README_es.md +++ b/README_es.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Versión actual:** 9.9.0~ynh1 +**Versión actual:** 9.9.1~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index c0ed782..dca2ff4 100644 --- a/README_eu.md +++ b/README_eu.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Paketatutako bertsioa:** 9.9.0~ynh1 +**Paketatutako bertsioa:** 9.9.1~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index fb190d3..0f1ab9e 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.9.0~ynh1 +**Version incluse :** 9.9.1~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 9609d55..2dee95d 100644 --- a/README_gl.md +++ b/README_gl.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Versión proporcionada:** 9.9.0~ynh1 +**Versión proporcionada:** 9.9.1~ynh1 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 3161012..76c822a 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**分发版本：** 9.9.0~ynh1 +**分发版本：** 9.9.1~ynh1 ## 截图 From 774206d58be2c78cc3e15a5045b6af40df267c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:33:55 +0200 Subject: [PATCH 08/13] Update manifest.toml --- manifest.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest.toml b/manifest.toml index 782ceec..0179c54 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.9.1~ynh1" +version = "9.10.0~ynh1" maintainers = ["pmorinerie"] @@ -76,18 +76,18 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://releases.mattermost.com/9.9.1/mattermost-team-9.9.1-linux-amd64.tar.gz" - amd64.sha256 = "24e862acf3a46ad52db7f24581357c4623faa391c1148d5ca7ed17c1228d081c" - arm64.url = "https://releases.mattermost.com/9.9.1/mattermost-team-9.9.1-linux-arm64.tar.gz" - arm64.sha256 = "bebed15f1b1d8f96de247406c1519eced1dea0f2f419e4579c94eba32bf1759b" + amd64.url = "https://releases.mattermost.com/9.10.0/mattermost-team-9.10.0-linux-amd64.tar.gz" + amd64.sha256 = "eb29b651831cc355222f88743678414e0e959f8bbdaa1bbeff72e5ddade1cdb0" + arm64.url = "https://releases.mattermost.com/9.10.0/mattermost-team-9.10.0-linux-arm64.tar.gz" + arm64.sha256 = "91db9cb5e939eac6e94e854257bd02145783a63cecb944484822a3e3334ef01d" armhf.url = "https://github.com/remiheens/mattermost-docker-arm/releases/download/v9.9.0/mattermost-v9.9.0-linux-arm.tar.gz" armhf.sha256 = "612b2a0bca1b1755291d5723dcf617be6d0848474b58727151d8cbf2d5431826" [resources.sources.enterprise] - amd64.url = "https://releases.mattermost.com/9.9.1/mattermost-enterprise-9.9.1-linux-amd64.tar.gz" - amd64.sha256 = "d2303a5e54eb7308081022f72c9c15c2e8206966c7c9048d2911dc71a3972493" - arm64.url = "https://releases.mattermost.com/9.9.1/mattermost-enterprise-9.9.1-linux-arm64.tar.gz" - arm64.sha256 = "48b5e3ca8197d61682973a86b123b60066b997a580c443096d2da1a0e28caa86" + amd64.url = "https://releases.mattermost.com/9.10.0/mattermost-enterprise-9.10.0-linux-amd64.tar.gz" + amd64.sha256 = "59db22a1640079b1ea1789ee0e232fc2a6a0433593946b32b47eb33832879d7c" + arm64.url = "https://releases.mattermost.com/9.10.0/mattermost-enterprise-9.10.0-linux-arm64.tar.gz" + arm64.sha256 = "d485b3d0a4bba5bd289dc889f7930a2ffe9d1b82414ece0c7f7551cb893978fd" [resources.system_user] allow_email = true @@ -95,7 +95,7 @@ ram.runtime = "50M" [resources.install_dir] [resources.data_dir] - + [resources.ports] [resources.permissions] From a99aa45eab347828250bfe15bd4955a4a59f7ba4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 19 Jul 2024 12:34:00 +0000 Subject: [PATCH 09/13] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 58e9c93..c418897 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.9.1~ynh1 +**Shipped version:** 9.10.0~ynh1 ## Screenshots diff --git a/README_es.md b/README_es.md index 473f087..02129d0 100644 --- a/README_es.md +++ b/README_es.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Versión actual:** 9.9.1~ynh1 +**Versión actual:** 9.10.0~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index dca2ff4..2947c8d 100644 --- a/README_eu.md +++ b/README_eu.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Paketatutako bertsioa:** 9.9.1~ynh1 +**Paketatutako bertsioa:** 9.10.0~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 0f1ab9e..45fab4b 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.9.1~ynh1 +**Version incluse :** 9.10.0~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 2dee95d..bbdf3e1 100644 --- a/README_gl.md +++ b/README_gl.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Versión proporcionada:** 9.9.1~ynh1 +**Versión proporcionada:** 9.10.0~ynh1 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 76c822a..c080f09 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**分发版本：** 9.9.1~ynh1 +**分发版本：** 9.10.0~ynh1 ## 截图 From 7784692a3af1f673561a47773467f124e4821c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 20 Jul 2024 17:27:53 +0200 Subject: [PATCH 10/13] Update config.json --- conf/config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/config.json b/conf/config.json index bfb1208..708188e 100644 --- a/conf/config.json +++ b/conf/config.json @@ -496,7 +496,8 @@ "DisableAppBar": false, "DisableRefetchingOnBrowserFocus": false, "DelayChannelAutocomplete": false, - "DisableWakeUpReconnectHandler": false + "DisableWakeUpReconnectHandler": false, + "UsersStatusAndProfileFetchingPollIntervalMilliseconds": 3000 }, "AnalyticsSettings": { "MaxUsersForStatistics": 2500 @@ -645,8 +646,7 @@ "ChannelBookmarks": false, "WebSocketEventScope": false, "NotificationMonitoring": true, - "ExperimentalAuditSettingsSystemConsoleUI": false, - "ClientMetrics": false + "ExperimentalAuditSettingsSystemConsoleUI": false }, "ImportSettings": { "Directory": "./import", From d9c897ae11a8f5400b83b0e09f6a46e70ae6be10 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:58:56 +0200 Subject: [PATCH 11/13] Delete Vagrantfile, super old stuff much probably nor working anymore --- Vagrantfile | 100 ---------------------------------------------------- 1 file changed, 100 deletions(-) delete mode 100644 Vagrantfile diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 6333f72..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,100 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# All Vagrant configuration is done below. The "2" in Vagrant.configure -# configures the configuration version (we support older styles for -# backwards compatibility). Please don't change it unless you know what -# you're doing. -Vagrant.configure("2") do |config| - # The most common configuration options are documented and commented below. - # For a complete reference, please see the online documentation at - # https://docs.vagrantup.com. - - config.vm.define :ynhtests - config.vm.box = "yunohost-stretch-unstable" - config.vm.box_url = "https://build.yunohost.org/yunohost-stretch-unstable.box" - - # Disable auto updates checks. Run `vagrant outdated` to perform manual updates. - config.vm.box_check_update = false - - # Configuration for the vagrant-disksize plugin. - # We need more space because package_check will create many LXC containers and snapshots. - # - # IMPORTANT: when re-creating the VM from scratch, the logical size of the disk will - # still be 10 Go. - # You'll need a live GParted ISO to resize partitions and fix it. - config.disksize.size = '20GB' - - # Force guest type, because YunoHost /etc/issue can't be tuned - config.vm.guest = :debian - - # Create a forwarded port mapping which allows access to a specific port - # within the machine from a port on the host machine. In the example below, - # accessing "localhost:8080" will access port 80 on the guest machine. - # config.vm.network "forwarded_port", guest: 80, host: 8080 - # config.vm.network "forwarded_port", guest: 443, host: 8443 - - # Create a private network, which allows host-only access to the machine - # using a specific IP. - config.vm.network "private_network", ip: "192.168.33.10" - - # Use the NAT hosts DNS resolver. Fixes slow network in the guest. - # See https://serverfault.com/questions/495914/vagrant-slow-internet-connection-in-guest - #config.vm.provider "virtualbox" do |v| - # v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"] - # v.customize ["modifyvm", :id, "--natdnsproxy1", "on"] - # v.customize ["modifyvm", :id, "--nictype1", "virtio"] - #end - - # Share an additional folder to the guest VM. The first argument is - # the path on the host to the actual folder. The second argument is - # the path on the guest to mount the folder. And the optional third - # argument is a set of non-required options. - config.vm.synced_folder "./", "/vagrant", - owner: "root", - group: "sudo", - mount_options: ["dmode=775,fmode=774"] - - # Enable provisioning with a shell script. Additional provisioners such as - # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the - # documentation for more information about their specific syntax and use. - config.vm.provision "shell", privileged: false, keep_color: true, inline: <<-SHELL - DOMAIN=ynhtests.local - YUNOHOST_ADMIN_PASSWORD="ynhadminpwd" - - # Stop on first error - set -e - - if ! [[ -f /etc/yunohost/installed ]]; then - # Upgrade Yunohost and the system packages - sudo apt-get update - sudo apt-get upgrade --yes - # Run dist-upgrade twice, as the first Yunohost upgrade may fail - sudo apt-get dist-upgrade --yes || sudo apt-get dist-upgrade --yes - - # Finish Yunohost installation - sudo yunohost tools postinstall --domain ${DOMAIN} --password ${YUNOHOST_ADMIN_PASSWORD} --ignore-dyndns - fi - - # Install package_check - if ! [ -f "$HOME/package_check/package_check.sh" ]; then - git clone https://github.com/YunoHost/package_check - - # Fix LXC containers not being able to reach outside internet. - # The default configuration is to detect the default gateway used - # by the Vagrant machine to configure LXC containers. - # Unfortunately this results in the LXC containers not being able - # to connect to the Internet. - echo "dns=8.8.8.8" > $HOME/package_check/config - fi - - # Build the initial LXC container - if ! hash lxc-start 2>/dev/null || [ "$(sudo lxc-ls | wc -l)" == "0" ]; then - # Build the default LXC container - $HOME/package_check/sub_scripts/lxc_build.sh - - # Ensure the LXC container is correctly configured - $HOME/package_check/sub_scripts/lxc_check.sh - fi - SHELL -end From 47913f7519cd8f9690c86473784075e9a16ddff4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 22 Jul 2024 15:59:00 +0000 Subject: [PATCH 12/13] Auto-update READMEs --- ALL_README.md | 1 + README_id.md | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 README_id.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,5 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..33e438d --- /dev/null +++ b/README_id.md @@ -0,0 +1,73 @@ + + +# Mattermost untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/mattermost.svg)](https://ci-apps.yunohost.org/ci/apps/mattermost/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) + +[![Pasang Mattermost dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mattermost) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang Mattermost secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +## 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 PosgreSQL 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. + +## YunoHost specific features + +This package can install the [*Entreprise Edition*](https://docs.mattermost.com/overview/product.html#mattermost-enterprise-edition) or the [*Team Edition*](https://docs.mattermost.com/overview/product.html#mattermost-team-edition). + +Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/download/) + +## Features include: + +- One-to-one and group messaging, file sharing, and unlimited search history +- 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 + + +**Versi terkirim:** 9.10.0~ynh1 + +## Tangkapan Layar + +![Tangkapan Layar pada Mattermost](./doc/screenshots/screenshot.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi pengguna resmi: +- Dokumentasi admin resmi: +- Repositori kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing --debug +atau +sudo yunohost app upgrade mattermost -u https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** From 8c3e65a51ffca6a9ac7d73d6b4971fbdb545e2af Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Mon, 22 Jul 2024 18:00:02 +0200 Subject: [PATCH 13/13] Delete test.sh: super old stuff much probably nor working anymore --- test.sh | 113 -------------------------------------------------------- 1 file changed, 113 deletions(-) delete mode 100755 test.sh diff --git a/test.sh b/test.sh deleted file mode 100755 index 9514a9a..0000000 --- a/test.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash -# Run package_check tests against the app in the working directory on a Vagrant virtual machine. -# -# NB: Vagrant is used because package_check uses LXC containers, and Docker doesn't support running LXC. - -# Fail on first error -set -e - -# Configuration constants -APP_ID="mattermost" -APP_DIR="/vagrant" - -function _usage() { - echo "Run package_check tests against the app in the working directory on a Vagrant virtual machine." - echo "Usage: test.sh [--verbose] [--help]" -} - -# Configuration arguments -function _parse_args() { - VERBOSE=false - VERBOSE_OPT='' - while [ "$1" != "" ]; do - case $1 in - "-v" | "--verbose") - shift - VERBOSE=true - VERBOSE_OPT='--verbose';; - "--help") - _usage - exit;; - *) - _usage - exit 1;; - esac - done -} - -# Execute an ssh command on the vagrant box -function _vagrant_ssh() { - local command="$1" - local tty_output=$([ $VERBOSE ] && echo '/dev/stdout' || echo '/dev/null') - - [ $VERBOSE == true ] && echo "vagrant ssh -c \"$command\"" - - vagrant ssh -c "$command" \ - > $tty_output \ - 2> >(grep --invert-match 'Connection to 127.0.0.1 closed.' 1>&2) # Filter out the SSH deconnection message printed on stderr - local exit_code=$? - return $exit_code -} - -# Pre-download the app source archive declared in an app.src file. -# The local archive will be used during tests, instead of being re-downloaded every time. -# -# TODO: let package_check do the caching itself -function _cache_app_source() { - local app_src="conf/app.src" - if [ ! -e "conf/app.src" ]; then - return - fi - - local src_url=$(grep 'SOURCE_URL=' "$app_src" | cut -d= -f2-) - local src_format=$(grep 'SOURCE_FORMAT=' "$app_src" | cut -d= -f2-) - local src_filename=$(grep 'SOURCE_FILENAME=' "$app_src" | cut -d= -f2-) - if [ "$src_filename" = "" ] ; then - src_filename="app.${src_format}" - fi - - local lxc_name="pchecker_lxc" - local lxc_root="/var/lib/lxcsnaps/${lxc_name}/snap0/rootfs" - local local_src_dir="${lxc_root}/opt/yunohost-apps-src/${APP_ID}" - - local file_exists=false - _vagrant_ssh "sudo test -e ${local_src_dir}/${src_filename}" && file_exists=true - - if [ "$file_exists" = false ]; then - echo "--- Downloading and caching app source ---" - _vagrant_ssh " \ - sudo mkdir -p ${local_src_dir} && \ - sudo wget -O ${local_src_dir}/${src_filename} ${src_url};"; - fi -} - -function setup() { - echo "--- Setting up Vagrant VM ---" - vagrant up --provision - _cache_app_source -} - -function test_package_check() { - echo "--- Running package_check ---" - _vagrant_ssh "package_check/package_check.sh --bash-mode '$APP_DIR'" -} - -function abort() { - trap - SIGINT SIGTERM - echo "--- Aborting ---" - if (vagrant status | grep -q "running"); then - echo "Removing package_check lock…" - _vagrant_ssh "rm -f package_check/pcheck.lock" - fi - teardown -} -trap abort SIGINT SIGTERM - -function teardown() { - echo "--- Cleaning up ---" -} - -_parse_args $* -setup -test_package_check -teardown