Merge pull request #366 from YunoHost-Apps/testing

Testing
2024-09-03 19:36:29 +02:00 · 2022-05-20 08:31:30 +02:00 · 2022-05-20 08:31:30 +02:00 · b65cc9845b
commit b65cc9845b
parent 40a9cf459b 5d2dc7add6
10 changed files with 23 additions and 25 deletions
--- 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.6.1~ynh1
+**Shipped version:** 6.7.0~ynh1



--- 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.6.1~ynh1
+**Version incluse :** 6.7.0~ynh1



--- a/conf/amd64.src
+++ b/conf/amd64.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://releases.mattermost.com/6.6.1/mattermost-team-6.6.1-linux-amd64.tar.gz
-SOURCE_SUM=044e3ea02acc14873cd86513f68831a042f3a3ffe25280d24568f97886527751
+SOURCE_URL=https://releases.mattermost.com/6.7.0/mattermost-team-6.7.0-linux-amd64.tar.gz
+SOURCE_SUM=5ae7f74ee5aa1f3b0f1597c020eec1460a950ea77f60ce9123d1f8cac96d7beb
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/arm64.src
+++ b/conf/arm64.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.6.1/mattermost-v6.6.1-linux-arm64.tar.gz
-SOURCE_SUM=621a3947f80794e1d7d0ad636d5560565bfe161f8e23bef36e1734a388fddc6d
+SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.7.0/mattermost-v6.7.0-linux-arm64.tar.gz
+SOURCE_SUM=5dcbfbb75586c00b838910e93457c2fd0ec022319e7d41d11a053b24d161b568
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/armhf.src
+++ b/conf/armhf.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.6.1/mattermost-v6.6.1-linux-arm.tar.gz
-SOURCE_SUM=33e1e167b3d5cbb0a01bb36251b44ca0688ffd97f94e290d9398bec33ebc911b
+SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.7.0/mattermost-v6.7.0-linux-arm.tar.gz
+SOURCE_SUM=193d5cd02116b05b4b9bf4c064c569a4e15c032fb816ebd0a61cbd246dca9932
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- a/conf/config.json
+++ b/conf/config.json
@ -238,7 +238,8 @@
    "EmailNotificationContentsType": "full",
    "LoginButtonColor": "#0000",
    "LoginButtonBorderColor": "#2389D7",
-    "LoginButtonTextColor": "#2389D7"
+    "LoginButtonTextColor": "#2389D7",
+    "EnableInactivityEmail": true
  },
  "RateLimitSettings": {
    "Enable": false,
@ -451,7 +452,6 @@
    "LinkMetadataTimeoutMilliseconds": 5000,
    "RestrictSystemAdmin": false,
    "UseNewSAMLLibrary": false,
-    "CloudUserLimit": 0,
    "CloudBilling": false,
    "EnableSharedChannels": false,
    "EnableRemoteClusterService": false
@ -477,7 +477,7 @@
    "PostsAggregatorJobStartTime": "03:00",
    "IndexPrefix": "",
    "LiveIndexingBatchSize": 1,
-    "BulkIndexingTimeWindowSeconds": 3600,
+    "BatchSize": 10000,
    "RequestTimeoutSeconds": 30,
    "SkipTLSVerification": false,
    "Trace": ""
@ -487,7 +487,7 @@
    "EnableIndexing": false,
    "EnableSearching": false,
    "EnableAutocomplete": false,
-    "BulkIndexingTimeWindowSeconds": 3600
+    "BatchSize": 10000
  },
  "DataRetentionSettings": {
    "EnableMessageDeletion": false,
@ -517,7 +517,8 @@
  "JobSettings": {
    "RunJobs": true,
    "RunScheduler": true,
-    "CleanupJobsThresholdDays": -1
+    "CleanupJobsThresholdDays": -1,
+    "CleanupConfigThresholdDays": -1
  },
  "PluginSettings": {
    "Enable": true,
@ -572,7 +573,6 @@
  "FeatureFlags": {
    "TestFeature": "off",
    "TestBoolFeature": false,
-    "CloudDelinquentEmailJobsEnabled": false,
    "CollapsedThreads": true,
    "EnableRemoteClusterService": false,
    "AppsEnabled": true,
@ -581,10 +581,8 @@
    "PluginApps": "",
    "PluginFocalboard": "",
    "PermalinkPreviews": true,
-    "NewAccountNoisy": false,
    "CallsMobile": false,
    "BoardsFeatureFlags": "",
-    "AddMembersToChannel": "top",
    "GuidedChannelCreation": false,
    "InviteToTeam": "none",
    "CustomGroups": true,
@ -592,7 +590,9 @@
    "NormalizeLdapDNs": false,
    "EnableInactivityCheckJob": true,
    "UseCaseOnboarding": true,
-    "GraphQL": false
+    "GraphQL": false,
+    "InsightsEnabled": false,
+    "CommandPalette": false
  },
  "ImportSettings": {
    "Directory": "./import",
--- a/conf/enterprise.src
+++ b/conf/enterprise.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://releases.mattermost.com/6.6.1/mattermost-enterprise-6.6.1-linux-amd64.tar.gz
-SOURCE_SUM=ac0bce020f66145a8c72b26ea9f6f43f760ff2e380c4a2262cda02ebd34cc239
+SOURCE_URL=https://releases.mattermost.com/6.7.0/mattermost-enterprise-6.7.0-linux-amd64.tar.gz
+SOURCE_SUM=1b97ef44b9578ed2b609a6df31dfe59ebeb66c70319cedd09d5d3aa2f65e19a6
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
--- 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.6.1~ynh1",
+    "version": "6.7.0~ynh1",
    "url": "http://www.mattermost.org/",
    "upstream": {
        "license": "GPL-3.0-only",
--- a/scripts/install
+++ b/scripts/install
@ -31,7 +31,6 @@ 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_ARCH
 version=$YNH_APP_ARG_VERSION

 app=$YNH_APP_INSTANCE_NAME
@ -55,7 +54,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=6
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
-ynh_app_setting_set --app=$app --key=password --value=$password
+ynh_app_setting_set --app=$app --key=password --value="$password"
 ynh_app_setting_set --app=$app --key=language --value=$language
 ynh_app_setting_set --app=$app --key=version --value=$version
 ynh_app_setting_set --app=$app --key=team_display_name --value=$team_display_name
@ -100,7 +99,7 @@ if [ "$version" = "Enterprise" ]; then
  ynh_setup_source --dest_dir="$final_path" --source_id="enterprise"
 elif [ "$version" = "Team" ]; then
  # Get Team binary path
-  ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
+  ynh_setup_source --dest_dir="$final_path" --source_id="$YNH_ARCH"
 fi

 chmod 750 "$final_path"
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -32,7 +32,6 @@ 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_ARCH
 version=$(ynh_app_setting_get --app=$app --key=version)
 data_path=$(ynh_app_setting_get --app=$app --key=data_path)

@ -136,7 +135,7 @@ then
  if [ "$version" = "Enterprise" ]; then
    ynh_setup_source --dest_dir="$final_path" --source_id="enterprise"
  elif [ "$version" = "Team" ]; then
-    ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
+    ynh_setup_source --dest_dir="$final_path" --source_id="$YNH_ARCH"
  fi

  # Copy the admin saved settings and plugins from tmp directory to final path