Skip to content

Updated Mattermost config settings to match latest

Harrison Healey requested to merge mattermost/omnibus-gitlab:missing-mattermost-settings into master

This is to add all missing Mattermost config settings to gitlab.rb.template and config.json.erb so that Mattermost's config.json will be generated properly. I also re-arranged the settings in config.json.erb to match Mattermost's default.json so that it's easier to keep them the same in the future.

The following missing settings have been added:

  • ServiceSettings.WebsocketSecurePort - Controls the port used by the websocket with HTTPS enabled
  • ServiceSettings.WebsocketPort - Controls the port used by the websocket without HTTPS enabled
  • ServiceSettings.WebserverMode - Controls how the Mattermost server serves up static files, defaulting to gzipping them
  • ServiceSettings.SessionIdleTimeoutInMinutes - Controls how long a user can be away before their session is revoked in the web and desktop apps, defaulting to disabled
  • TeamSettings.MaxNotificationsPerChannel - Controls the number of users that can be in a channel before channel-wide notifications are disabled
  • NativeAppSettings.AppDownloadLink - Controls the "Download Apps" links in the main menu and tutorial
  • NativeAppSettings.AndroidAppDownloadLink - Controls the download link appearing on the Android browser splash page
  • NativeAppSettings.IosAppDownloadLink - Controls the download link appearing on the iOS browser splash page

The following settings have been removed from Mattermost, so they were also removed from here:

  • TeamSettings.RestrictTeamNames
  • StorageSettings.AmazonS3BucketEndpoint
  • StorageSettings.AmazonS3LocationConstraint
  • StorageSettings.AmazonS3LowercaseBucket

I also noticed that the following settings had been accidentally included in gitlab.rb.template, but I didn't remove them in case people were using them:

  • SqlSettings.DataSourceSearchReplicas - This setting does nothing in Mattermost TE
  • TeamSettings.EnableXToLeaveChannelsFromLHS - This setting is experimental
  • ServiceSettings.EnablePreviewFeatures- This setting is experimental
  • ServiceSettings.CloseUnusedDirectMessages - This setting is experimental
  • EmailSettings.UseChannelInEmailNotifications - This setting is experimental

I'm just testing these changes, and then I'll remove the WIP label from this MR

Edited by GitLab Release Tools Bot

Merge request reports