From 982af69b0c121964f9b54414cea5c6719aa7e002 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 3 Dec 2021 23:25:41 +0100 Subject: [PATCH 1/6] Update config.json --- conf/config.json | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/conf/config.json b/conf/config.json index 8fc3d81..b72664a 100644 --- a/conf/config.json +++ b/conf/config.json @@ -82,6 +82,7 @@ "EnableBotAccountCreation": false, "EnableSVGs": false, "EnableLatex": false, + "EnableInlineLatex": true, "EnableAPIChannelDeletion": false, "EnableLocalMode": true, "LocalModeSocketLocation": "__LOCAL_SOCKET_PATH__", @@ -512,7 +513,8 @@ }, "JobSettings": { "RunJobs": true, - "RunScheduler": true + "RunScheduler": true, + "CleanupJobsThresholdDays": -1 }, "PluginSettings": { "Enable": true, @@ -571,10 +573,15 @@ "PluginPlaybooks": "", "PluginApps": "", "PluginFocalboard": "", - "TimedDND": false, "PermalinkPreviews": true, "GlobalHeader": true, - "AddChannelButton": "by_team_name" + "AddChannelButton": "by_team_name", + "PrewrittenMessages": "tour_point", + "DownloadAppsCTA": "tips_and_next_steps", + "NewAccountNoisy": false, + "BoardsUnfurl": true, + "CallsMobile": false, + "AutoTour": "none" }, "ImportSettings": { "Directory": "./import", @@ -584,4 +591,4 @@ "Directory": "./export", "RetentionDays": 30 } -} \ No newline at end of file +} From 678a1d80cbfd9aa89d8e74e61fb536fdaedf2edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 6 Dec 2021 12:37:56 +0100 Subject: [PATCH 2/6] Remove ynh_detect_arch helper (#317) ynh_detect_arch is deprecated in favor of YNH_ARCH * Add #315 and #316 --- README.md | 1 + README_fr.md | 3 ++- conf/{x86-64.src => amd64.src} | 0 conf/{arm.src => armhf.src} | 0 conf/nginx.conf | 5 ----- doc/DISCLAIMER.md | 1 + doc/DISCLAIMER_fr.md | 3 ++- manifest.json | 2 +- scripts/_common.sh | 26 -------------------------- scripts/install | 2 +- scripts/upgrade | 2 +- 11 files changed, 9 insertions(+), 36 deletions(-) rename conf/{x86-64.src => amd64.src} (100%) rename conf/{arm.src => armhf.src} (100%) diff --git a/README.md b/README.md index 0d161ff..da066b4 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,7 @@ To explore the benefits of Mattermost’s enterprise features, you can replace t ## Configuration * How to configure this app: From an admin panel, a plain file with SSH. +* How to change from edition version to another (Team<->Enterprise) : Modify the `settings.yml` in the apps directory `/etc/yunohost/apps/mattermost_instance/settings.yml` and replace the version to wich you whant : Team or Enterprise. Update your apps and verify the *About* on your mattermost ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index b15ea3b..593a7ec 100644 --- a/README_fr.md +++ b/README_fr.md @@ -45,7 +45,8 @@ Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vou ## Configuration - * Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH. +* Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH. +* Comment changer d'une version à une autre (Team<->Enterprise) : Modifiez le `settings.yml` dans le répertoire de l'application `/etc/yunohost/apps/mattermost_instance/settings.yml` et remplacez la version avec celle que vous voulez : Team ou Enterprise. Mettez à jour votre application et vérifiez dans le *À Propos* sur la console système de votre application. ## Caractéristiques spécifiques YunoHost diff --git a/conf/x86-64.src b/conf/amd64.src similarity index 100% rename from conf/x86-64.src rename to conf/amd64.src diff --git a/conf/arm.src b/conf/armhf.src similarity index 100% rename from conf/arm.src rename to conf/armhf.src diff --git a/conf/nginx.conf b/conf/nginx.conf index 9eff7cb..312a59d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -34,9 +34,4 @@ location __PATH__/ { #proxy_cache_use_stale timeout; #proxy_cache_lock on; proxy_pass http://127.0.0.1:__PORT__; - - # Yunohost addition: redirect HTTP to HTTPS - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } } diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index d07fc7d..b4c5f33 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,6 +1,7 @@ ## Configuration * How to configure this app: From an admin panel, a plain file with SSH. +* How to change from edition version to another (Team<->Enterprise) : Modify the `settings.yml` in the apps directory `/etc/yunohost/apps/mattermost_instance/settings.yml` and replace the version to wich you whant : Team or Enterprise. Update your apps and verify the *About* on your mattermost ## YunoHost specific features diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index a7d4e66..188abf6 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,6 +1,7 @@ ## Configuration - * Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH. +* Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH. +* Comment changer d'une version à une autre (Team<->Enterprise) : Modifiez le `settings.yml` dans le répertoire de l'application `/etc/yunohost/apps/mattermost_instance/settings.yml` et remplacez la version avec celle que vous voulez : Team ou Enterprise. Mettez à jour votre application et vérifiez dans le *À Propos* sur la console système de votre application. ## Caractéristiques spécifiques YunoHost diff --git a/manifest.json b/manifest.json index 0fb14d6..8621e8b 100644 --- a/manifest.json +++ b/manifest.json @@ -26,7 +26,7 @@ "mysql" ], "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.3.0" }, "arguments": { "install": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 4dd6f6b..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,32 +12,6 @@ # EXPERIMENTAL HELPERS #================================================= -# Check the architecture -# -# example: architecture=$(ynh_detect_arch) -# -# usage: ynh_detect_arch -# -# Requires YunoHost version 2.2.4 or higher. - -ynh_detect_arch(){ - local architecture - if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then - architecture="arm64" - elif [ -n "$(uname -m | grep 64)" ]; then - architecture="x86-64" - elif [ -n "$(uname -m | grep armv7)" ]; then - architecture="arm" - elif [ -n "$(uname -m | grep armv6)" ]; then - architecture="arm" - elif [ -n "$(uname -m | grep armv5)" ]; then - architecture="arm" - else - architecture="unknown" - fi - echo $architecture -} - #================================================= # FUTURE OFFICIAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 29af62e..d3b1eaf 100644 --- a/scripts/install +++ b/scripts/install @@ -31,7 +31,7 @@ email=$(ynh_user_get_info --username=$admin --key=mail) password=$YNH_APP_ARG_PASSWORD language=$YNH_APP_ARG_LANGUAGE team_display_name=$YNH_APP_ARG_TEAM_DISPLAY_NAME -architecture=$(ynh_detect_arch) +architecture=$YNH_ARCH version=$YNH_APP_ARG_VERSION app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/upgrade b/scripts/upgrade index 867c172..03e870e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,7 +32,7 @@ port=$(ynh_app_setting_get --app=$app --key=port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -architecture=$(ynh_detect_arch) +architecture=$YNH_ARCH version=$(ynh_app_setting_get --app=$app --key=version) data_path=$(ynh_app_setting_get --app=$app --key=data_path) From 2cece42e2dc35c100001c9c733855d6373d38679 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 7 Dec 2021 18:26:54 +0100 Subject: [PATCH 3/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 8621e8b..b1e405c 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": "6.1.0~ynh1", + "version": "6.1.0~ynh2", "url": "http://www.mattermost.org/", "upstream": { "license": "GPL-3.0-only", From ec163067f1296412a43fafae31f505b34b3c8fb8 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 7 Dec 2021 17:27:00 +0000 Subject: [PATCH 4/6] 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 da066b4..65b91d1 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:** 6.1.0~ynh1 +**Shipped version:** 6.1.0~ynh2 diff --git a/README_fr.md b/README_fr.md index 593a7ec..8d488df 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 :** 6.1.0~ynh1 +**Version incluse :** 6.1.0~ynh2 From c8bd48b44d903fa5d897169e95692ad9153c2d31 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 21 Dec 2021 06:08:12 +0000 Subject: [PATCH 5/6] Upgrade to v6.2.1 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- conf/enterprise.src | 4 ++-- manifest.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 5671c8d..e6d6579 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.mattermost.com/6.1.0/mattermost-team-6.1.0-linux-amd64.tar.gz -SOURCE_SUM=8f7ed5402109c7b8c6eb30c654148c8fea56a4c81650d282d3c15443fbcb8410 +SOURCE_URL=https://releases.mattermost.com/6.2.1/mattermost-team-6.2.1-linux-amd64.tar.gz +SOURCE_SUM=4fcc4185ff3a5f6f6e96c327bfeef48e11621cf8b850a66821b469dcf9c6bb10 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index c7c5dbc..6c4e9f4 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.1.0/mattermost-v6.1.0-linux-arm64.tar.gz -SOURCE_SUM=4fa5e55699749bb524eb1e9b4b918e862c5eaf55678f4590cdeb9b5fa9e35411 +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.2.1/mattermost-v6.2.1-linux-arm64.tar.gz +SOURCE_SUM=d63df70e27ee71fbb802b322b74a93168b0f19d3283865dd5dbf69d8daa9b4b0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/armhf.src b/conf/armhf.src index e2e014c..7377aea 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.1.0/mattermost-v6.1.0-linux-arm.tar.gz -SOURCE_SUM=9b81f4fa74ab69f636beba0dd9ee07bef86f9e6320caed394f1878b433818ae8 +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.2.1/mattermost-v6.2.1-linux-arm.tar.gz +SOURCE_SUM=44b1fdd99f91448d6d6d0becff52804e30b0da8bb6dd6b4ad884da2605342532 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/enterprise.src b/conf/enterprise.src index 2fb9dde..b5c5415 100644 --- a/conf/enterprise.src +++ b/conf/enterprise.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.mattermost.com/6.1.0/mattermost-enterprise-6.1.0-linux-amd64.tar.gz -SOURCE_SUM=304a46c1abf984b97d6adaf74b8ab4324df68178dcd95cdf721ad02756c7e14d +SOURCE_URL=https://releases.mattermost.com/6.2.1/mattermost-enterprise-6.2.1-linux-amd64.tar.gz +SOURCE_SUM=a55fccc0c08af2f3330125ee335f9e3dc6ab220adc3409052c47663f26bdd751 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b1e405c..6dee1b6 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": "6.1.0~ynh2", + "version": "6.2.1~ynh1", "url": "http://www.mattermost.org/", "upstream": { "license": "GPL-3.0-only", From 4aab82c600f1a5f342bc7d1690ca4a18dff97535 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 21 Dec 2021 06:08:17 +0000 Subject: [PATCH 6/6] 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 65b91d1..eba6776 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:** 6.1.0~ynh2 +**Shipped version:** 6.2.1~ynh1 diff --git a/README_fr.md b/README_fr.md index 8d488df..b8a46ea 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 :** 6.1.0~ynh2 +**Version incluse :** 6.2.1~ynh1