Skip to content
Snippets Groups Projects
Commit 78e38d9b authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch 'mattermost-5.27.0' into 'master'

Update Mattermost to 5.27.0 and identify Omnibus installs in MM

See merge request gitlab-org/omnibus-gitlab!4612
parents 12d1cf15 c4a6a7aa
No related branches found
No related tags found
No related merge requests found
---
title: Update Mattermost to 5.27.0
merge_request:
author:
type: other
Loading
Loading
@@ -17,10 +17,10 @@
#
 
name 'mattermost'
default_version '5.26.2'
default_version '5.27.0'
 
source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
md5: '9c465a8a4cfaac2f2c7fc19a16c664d3'
md5: '4d407a020be6a9ace0e98b523d08c497'
 
relative_path 'mattermost'
 
Loading
Loading
Loading
Loading
@@ -276,6 +276,7 @@ Below is a list of Mattermost versions for GitLab 11.10 and later:
| 13.2 | 5.24 |
| 13.3 | 5.25 |
| 13.4 | 5.26 |
| 13.5 | 5.27 |
 
Starting with GitLab 11.0, GitLab Mattermost can be upgraded through the regular Omnibus GitLab update process. When upgrading previous versions of
GitLab that process can only be used if Mattermost configuration settings have not been changed outside of GitLab (i.e., no changes to Mattermost's `config.json`
Loading
Loading
Loading
Loading
@@ -46,7 +46,8 @@ class MattermostHelper
'MM_GITLABSETTINGS_TOKENENDPOINT' => node['mattermost']['gitlab_token_endpoint'].to_s,
'MM_GITLABSETTINGS_USERAPIENDPOINT' => node['mattermost']['gitlab_user_api_endpoint'].to_s,
'MM_PLUGINSETTINGS_DIRECTORY' => node['mattermost']['plugin_directory'].to_s,
'MM_PLUGINSETTINGS_CLIENTDIRECTORY' => node['mattermost']['plugin_client_directory'].to_s
'MM_PLUGINSETTINGS_CLIENTDIRECTORY' => node['mattermost']['plugin_client_directory'].to_s,
'MM_INSTALL_TYPE' => 'gitlab_omnibus'
}
end
end unless defined?(MattermostHelper) # Prevent reloading in chefspec: https://github.com/sethvargo/chefspec/issues/562#issuecomment-74120922
Loading
Loading
@@ -12,6 +12,7 @@ RSpec.describe 'gitlab::mattermost' do
'MM_GITLABSETTINGS_SECRET' => '',
'MM_GITLABSETTINGS_TOKENENDPOINT' => 'http://gitlab.example.com/oauth/token',
'MM_GITLABSETTINGS_USERAPIENDPOINT' => 'http://gitlab.example.com/api/v4/user',
'MM_INSTALL_TYPE' => 'gitlab_omnibus',
'MM_LOGSETTINGS_FILELOCATION' => '/var/log/gitlab/mattermost',
'MM_PLUGINSETTINGS_CLIENTDIRECTORY' => '/var/opt/gitlab/mattermost/client-plugins',
'MM_PLUGINSETTINGS_DIRECTORY' => '/var/opt/gitlab/mattermost/plugins',
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment