From 3a1ff964269bc6905ee719b276431e0f23b014ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 14 Jan 2024 19:42:44 +0100 Subject: [PATCH 1/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7c3bae9..4f2b7aa 100644 --- a/manifest.toml +++ b/manifest.toml @@ -25,7 +25,7 @@ ldap = false sso = false -disk = "50M" +disk = "750M" ram.build = "350M" ram.runtime = "50M" From 0f6129b16b2a3d440de426df33ff318ec95a35ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 4 Feb 2024 21:20:09 +0100 Subject: [PATCH 2/9] update conf with upstream --- conf/config.json | 11 ++++++++--- manifest.toml | 18 +++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/conf/config.json b/conf/config.json index 12752c3..6da8d90 100644 --- a/conf/config.json +++ b/conf/config.json @@ -107,7 +107,8 @@ "EnableCustomGroups": true, "SelfHostedPurchase": true, "AllowSyncedDrafts": true, - "UniqueEmojiReactionLimitPerPost": 50 + "UniqueEmojiReactionLimitPerPost": 50, + "RefreshPostStatsRunTime": "00:00" }, "TeamSettings": { "SiteName": "Mattermost", @@ -556,7 +557,9 @@ "SMTPUsername": "", "SMTPPassword": "", "EmailAddress": "", - "SMTPServerTimeout": 1800 + "SMTPServerTimeout": 1800, + "CustomSMTPServerName": "", + "CustomSMTPPort": "25" } }, "JobSettings": { @@ -630,7 +633,9 @@ "CloudReverseTrial": false, "EnableExportDirectDownload": false, "StreamlinedMarketplace": true, - "ConsumePostHook": false + "CloudIPFiltering": false, + "ConsumePostHook": false, + "CloudAnnualRenewals": false }, "ImportSettings": { "Directory": "./import", diff --git a/manifest.toml b/manifest.toml index 4f2b7aa..6c7a0e5 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.3.0~ynh1" +version = "9.4.2~ynh1" maintainers = ["pmorinerie"] @@ -76,18 +76,18 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://releases.mattermost.com/9.3.0/mattermost-team-9.3.0-linux-amd64.tar.gz" - amd64.sha256 = "a53ddf36e313f0d5bc69ecd5940d089ce0b6ab392831e8126edbba22dc0946b4" - arm64.url = "https://releases.mattermost.com/9.3.0/mattermost-team-9.3.0-linux-arm64.tar.gz" - arm64.sha256 = "b459b43f599fed5a1905e49e4605198a2cfdedf8fd7e54a361ca17adb047df00" + 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/SmartHoneybee/ubiquitous-memory/releases/download/v7.5.2/mattermost-v7.5.2-linux-arm.tar.gz" armhf.sha256 = "b26a4b676ee92ac848fa2993aa67559238ba7d8c1d0e6f7ffdd79ad8fb4942f3" [resources.sources.enterprise] - amd64.url = "https://releases.mattermost.com/9.3.0/mattermost-enterprise-9.3.0-linux-amd64.tar.gz" - amd64.sha256 = "2145f476b53f51c454c4f2631664ff080c46390928d2be142d3697750a023f3f" - arm64.url = "https://releases.mattermost.com/9.3.0/mattermost-enterprise-9.3.0-linux-arm64.tar.gz" - arm64.sha256 = "b2d1dab455228d60c4f29fd323f28a6387d8a87691388ae087f4487ef8b5086b" + 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" [resources.system_user] allow_email = true From 08262bca78e120a3348cbdd82afd82c7e89089d0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 4 Feb 2024 20:20:14 +0000 Subject: [PATCH 3/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 f27cde7..2946c3d 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.3.0~ynh1 +**Shipped version:** 9.4.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 1eaeb6b..d339806 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.3.0~ynh1 +**Version incluse :** 9.4.2~ynh1 ## Captures d’écran From 20da43fedf7f89b59d6695dc515e1978640f04b6 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 13 Feb 2024 04:19:22 +0100 Subject: [PATCH 4/9] upgrade the arm source --- manifest.toml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/manifest.toml b/manifest.toml index 6c7a0e5..2f1f628 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Plateforme de collaboration open source conçue pour les déve version = "9.4.2~ynh1" -maintainers = ["pmorinerie"] +maintainers = [ "pmorinerie" ] [upstream] license = "GPL-3.0-only" @@ -18,7 +18,7 @@ code = "https://github.com/mattermost/mattermost-server" [integration] yunohost = ">= 11.2" -architectures = ["amd64", "armhf", "arm64"] +architectures = [ "amd64", "armhf", "arm64" ] multi_instance = true ldap = false @@ -55,14 +55,14 @@ ram.runtime = "50M" help.en = "Use Team Edition for the open source version (ARM, ARM64 and x86-64 support) or Enterprise Edition if you want to use a license (x86-64 and ARM64 support)" help.fr = "Utilisez Team Edition pour la version open-source (prise en charge ARM, ARM64 et x86-64) ou Édition Enterprise si vous souhaitez utiliser une licence (prise en charge x86-64 et ARM64)" type = "select" - choices = ["Enterprise", "Team"] + choices = [ "Enterprise", "Team" ] default = "Team" [install.language] ask.en = "Choose the language of the chat for the admin" ask.fr = "Choissisez la langue utilisée par le compte administrateur" type = "select" - choices = ["de", "en", "es", "fr", "it", "pt"] + choices = [ "de", "en", "es", "fr", "it", "pt" ] default = "en" [install.team_display_name] @@ -80,8 +80,8 @@ ram.runtime = "50M" 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/SmartHoneybee/ubiquitous-memory/releases/download/v7.5.2/mattermost-v7.5.2-linux-arm.tar.gz" - armhf.sha256 = "b26a4b676ee92ac848fa2993aa67559238ba7d8c1d0e6f7ffdd79ad8fb4942f3" + 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" [resources.sources.enterprise] amd64.url = "https://releases.mattermost.com/9.4.2/mattermost-enterprise-9.4.2-linux-amd64.tar.gz" @@ -89,20 +89,20 @@ ram.runtime = "50M" arm64.url = "https://releases.mattermost.com/9.4.2/mattermost-enterprise-9.4.2-linux-arm64.tar.gz" arm64.sha256 = "57e8cfcbf89ef56d27ed18f751db3ceeb1f18d62ab33694a67d7b86a9d3d1faf" - [resources.system_user] - allow_email = true +[resources.system_user] +allow_email = true - [resources.install_dir] +[resources.install_dir] - [resources.data_dir] +[resources.data_dir] - [resources.ports] +[resources.ports] - [resources.permissions] - main.url = "/" +[resources.permissions] +main.url = "/" - [resources.apt] - packages = "postgresql, pgloader" +[resources.apt] +packages = "postgresql, pgloader" - [resources.database] - type = "postgresql" +[resources.database] +type = "postgresql" From cdad32445ae2e735033df1058b1d049e9412f8fe Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Wed, 21 Feb 2024 02:52:41 +0100 Subject: [PATCH 5/9] Update manifest.toml --- manifest.toml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2f1f628..4690317 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Plateforme de collaboration open source conçue pour les déve version = "9.4.2~ynh1" -maintainers = [ "pmorinerie" ] +maintainers = ["pmorinerie"] [upstream] license = "GPL-3.0-only" @@ -18,7 +18,7 @@ code = "https://github.com/mattermost/mattermost-server" [integration] yunohost = ">= 11.2" -architectures = [ "amd64", "armhf", "arm64" ] +architectures = ["amd64", "armhf", "arm64"] multi_instance = true ldap = false @@ -39,7 +39,7 @@ ram.runtime = "50M" [install.init_main_permission] help.en = "If visitors selected, Mattermost will be accessible by users without a YunoHost account. This can be changed later via the webadmin." - help.fr = "Si « Visiteurs » est sélectionné, Mattermost sera accessible même par les utilisateurs n’ayant pas de compte YunoHost. Vous pourrez changer ce réglage plus tard dans l’interface d’administration." + help.fr = "Si « Visiteurs » est sélectionné, Mattermost sera accessible même par les utilisateurs n’ayant pas de compte YunoHost. Vous pourrez changer ce réglage plus tard dans l’interface d’administration." type = "group" default = "visitors" @@ -55,14 +55,14 @@ ram.runtime = "50M" help.en = "Use Team Edition for the open source version (ARM, ARM64 and x86-64 support) or Enterprise Edition if you want to use a license (x86-64 and ARM64 support)" help.fr = "Utilisez Team Edition pour la version open-source (prise en charge ARM, ARM64 et x86-64) ou Édition Enterprise si vous souhaitez utiliser une licence (prise en charge x86-64 et ARM64)" type = "select" - choices = [ "Enterprise", "Team" ] + choices = ["Enterprise", "Team"] default = "Team" [install.language] ask.en = "Choose the language of the chat for the admin" ask.fr = "Choissisez la langue utilisée par le compte administrateur" type = "select" - choices = [ "de", "en", "es", "fr", "it", "pt" ] + choices = ["de", "en", "es", "fr", "it", "pt"] default = "en" [install.team_display_name] @@ -89,20 +89,20 @@ ram.runtime = "50M" arm64.url = "https://releases.mattermost.com/9.4.2/mattermost-enterprise-9.4.2-linux-arm64.tar.gz" arm64.sha256 = "57e8cfcbf89ef56d27ed18f751db3ceeb1f18d62ab33694a67d7b86a9d3d1faf" -[resources.system_user] -allow_email = true + [resources.system_user] + allow_email = true -[resources.install_dir] + [resources.install_dir] -[resources.data_dir] + [resources.data_dir] -[resources.ports] + [resources.ports] -[resources.permissions] -main.url = "/" + [resources.permissions] + main.url = "/" -[resources.apt] -packages = "postgresql, pgloader" + [resources.apt] + packages = "postgresql, pgloader" -[resources.database] -type = "postgresql" + [resources.database] + type = "postgresql" From ff8021c50aed16553a000e5cbf300772994221a3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Feb 2024 01:52:45 +0000 Subject: [PATCH 6/9] Auto-update README --- README.md | 4 ++-- README_fr.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2946c3d..d44724e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -70,4 +70,4 @@ or sudo yunohost app upgrade mattermost -u https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index d339806..e4c72af 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ From 62958d407d0c8e86561aa363512538e5eba0308a Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Wed, 21 Feb 2024 02:54:15 +0100 Subject: [PATCH 7/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 4690317..45c7da7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -39,7 +39,7 @@ ram.runtime = "50M" [install.init_main_permission] help.en = "If visitors selected, Mattermost will be accessible by users without a YunoHost account. This can be changed later via the webadmin." - help.fr = "Si « Visiteurs » est sélectionné, Mattermost sera accessible même par les utilisateurs n’ayant pas de compte YunoHost. Vous pourrez changer ce réglage plus tard dans l’interface d’administration." + help.fr = "Si « Visiteurs » est sélectionné, Mattermost sera accessible même par les utilisateurs n’ayant pas de compte YunoHost. Vous pourrez changer ce réglage plus tard dans l’interface d’administration." type = "group" default = "visitors" From be193980e5ff0a16ade63e73648efc35db3c5e46 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Fri, 23 Feb 2024 23:21:10 +0100 Subject: [PATCH 8/9] bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 45c7da7..237869c 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~ynh1" +version = "9.4.2~ynh2" maintainers = ["pmorinerie"] From 9fbf4df5537a5ed8862f496eebef26555a38f4f5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 23 Feb 2024 22:21:14 +0000 Subject: [PATCH 9/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 d44724e..28219bf 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~ynh1 +**Shipped version:** 9.4.2~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e4c72af..363e182 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~ynh1 +**Version incluse :** 9.4.2~ynh2 ## Captures d’écran