Merge branch 'missing-mattermost-settings' into 'master'

Updated Mattermost config settings to match latest

See merge request gitlab-org/omnibus-gitlab!2248

CHANGELOG.md

@@ -55,6 +55,7 @@ omnibus-gitlab repository.
 10.6.4
 - Fixes an issue where unicorn and sidekiq services weren't being restarted after their configuration changed.
+- Added missing Mattermost settings to gitlab.rb
 10.6.2

files/gitlab-config-template/gitlab.rb.template

@@ -1159,6 +1159,10 @@ external_url 'GENERATED_EXTERNAL_URL'
 # mattermost['service_session_length_mobile_in_days'] = 30
 # mattermost['service_session_length_sso_in_days'] = 30
 # mattermost['service_session_cache_in_minutes'] = 10
+# mattermost['service_session_idle_timeout_in_minutes'] = 0
+# mattermost['service_websocket_secure_port'] = 443
+# mattermost['service_websocket_port'] = 80
+# mattermost['service_webserver_mode'] = 'gzip'
 # mattermost['service_connection_security'] = nil
 # mattermost['service_tls_cert_file'] = nil
 # mattermost['service_tls_key_file'] = nil
@@ -1190,9 +1194,9 @@ external_url 'GENERATED_EXTERNAL_URL'
 # mattermost['team_allow_public_link'] = true
 # mattermost['team_allow_valet_default'] = false
 # mattermost['team_restrict_creation_to_domains'] = "gmail.com"
-# mattermost['team_restrict_team_names'] = true
 # mattermost['team_restrict_direct_message'] = "any"
 # mattermost['team_max_channels_per_team'] = 2000
+# mattermost['team_max_notifications_per_channel'] = 1000
 # mattermost['team_enable_x_to_leave_channels_from_lhs'] = false
 # mattermost['team_user_status_away_timeout'] = 300
 # mattermost['team_enable_confirm_notifications_to_channel'] = true
@@ -1262,9 +1266,6 @@ external_url 'GENERATED_EXTERNAL_URL'
 # mattermost['file_amazon_s3_secret_access_key'] = nil
 # mattermost['file_amazon_s3_region'] = nil
 # mattermost["file_amazon_s3_endpoint"] = nil
-# mattermost["file_amazon_s3_bucket_endpoint"] = nil
-# mattermost["file_amazon_s3_location_constraint"] = false
-# mattermost["file_amazon_s3_lowercase_bucket"] = false
 # mattermost["file_amazon_s3_ssl"] = true
 # mattermost["file_amazon_s3_sign_v2"] = false
 # mattermost['file_enable_file_attachments'] = true
@@ -1301,6 +1302,10 @@ external_url 'GENERATED_EXTERNAL_URL'
 # mattermost['webrtc_gateway_turn_username'] = nil
 # mattermost['webrtc_gateway_turn_shared_key'] = nil
+# mattermost['native_app_app_download_link'] = "https://about.mattermost.com/downloads/"
+# mattermost['native_app_android_app_download_link'] = "https://about.mattermost.com/mattermost-android-app/"
+# mattermost['native_app_ios_app_download_link'] = "https://about.mattermost.com/mattermost-ios-app/"
+
 # mattermost['job_run_jobs'] = true
 # mattermost['job_run_scheduler'] = true

files/gitlab-cookbooks/mattermost/attributes/default.rb

@@ -58,6 +58,10 @@ default['mattermost']['service_session_length_web_in_days'] = 30
 default['mattermost']['service_session_length_mobile_in_days'] = 30
 default['mattermost']['service_session_length_sso_in_days'] = 30
 default['mattermost']['service_session_cache_in_minutes'] = 10
+default['mattermost']['service_session_idle_timeout_in_minutes'] = 0
+default['mattermost']['service_websocket_secure_port'] = 443
+default['mattermost']['service_websocket_port'] = 80
+default['mattermost']['service_webserver_mode'] = 'gzip'
 default['mattermost']['service_connection_security'] = nil
 default['mattermost']['service_tls_cert_file'] = nil
 default['mattermost']['service_tls_key_file'] = nil
@@ -103,9 +107,6 @@ default['mattermost']['file_amazon_s3_bucket'] = nil
 default['mattermost']['file_amazon_s3_secret_access_key'] = nil
 default['mattermost']['file_amazon_s3_bucket'] = nil
 default['mattermost']["file_amazon_s3_endpoint"] = nil
-default['mattermost']["file_amazon_s3_bucket_endpoint"] = nil
-default['mattermost']["file_amazon_s3_location_constraint"] = false
-default['mattermost']["file_amazon_s3_lowercase_bucket"] = false
 default['mattermost']["file_amazon_s3_ssl"] = true
 default['mattermost']["file_amazon_s3_sign_v2"] = false
 default['mattermost']['file_enable_file_attachments'] = true
@@ -158,9 +159,9 @@ default['mattermost']['team_max_users_per_team'] = 150
 default['mattermost']['team_allow_public_link'] = true
 default['mattermost']['team_allow_valet_default'] = false
 default['mattermost']['team_restrict_creation_to_domains'] = nil
-default['mattermost']['team_restrict_team_names'] = true
 default['mattermost']['team_restrict_direct_message'] = "any"
 default['mattermost']['team_max_channels_per_team'] = 2000
+default['mattermost']['team_max_notifications_per_channel'] = 1000
 default['mattermost']['team_user_status_away_timeout'] = 300
 default['mattermost']['team_enable_confirm_notifications_to_channel'] = true
 default['mattermost']['team_teammate_name_display'] = "full_name"
@@ -189,6 +190,10 @@ default['mattermost']['webrtc_gateway_turn_uri'] = nil
 default['mattermost']['webrtc_gateway_turn_username'] = nil
 default['mattermost']['webrtc_gateway_turn_shared_key'] = nil
+default['mattermost']['native_app_app_download_link'] = "https://about.mattermost.com/downloads/"
+default['mattermost']['native_app_android_app_download_link'] = "https://about.mattermost.com/mattermost-android-app/"
+default['mattermost']['native_app_ios_app_download_link'] = "https://about.mattermost.com/mattermost-ios-app/"
+
 default['mattermost']['job_run_jobs'] = true
 default['mattermost']['job_run_scheduler'] = true

files/gitlab-cookbooks/mattermost/templates/default/config.json.erb

@@ -12,35 +12,39 @@
         "ReadTimeout": <%= @service_read_timeout %>,
         "WriteTimeout": <%= @service_write_timeout %>,
         "MaximumLoginAttempts": <%= @service_maximum_login_attempts %>,
+        "GoroutineHealthThreshold": <%= @service_goroutine_health_threshold %>,
         "GoogleDeveloperKey": "<%= @service_google_developer_key %>",
         "EnableOAuthServiceProvider": <%= @service_enable_oauth_service_provider %>,
         "EnableIncomingWebhooks": <%= @service_enable_incoming_webhooks %>,
         "EnableOutgoingWebhooks": <%= @service_enable_outgoing_webhooks %>,
         "EnableCommands": <%= @service_enable_commands %>,
-        "EnableCustomEmoji": <%= @service_enable_custom_emoji %>,
         "EnablePostUsernameOverride": <%= @service_enable_post_username_override %>,
         "EnablePostIconOverride": <%= @service_enable_post_icon_override %>,
+        "EnableAPIv3": <%= @service_enable_apiv3 %>,
+        "EnableLinkPreviews": <%= @service_enable_link_previews %>,
         "EnableTesting": <%= @service_enable_testing %>,
+        "EnableDeveloper": <%= @service_enable_developer %>,
         "EnableSecurityFixAlert": <%= @service_enable_security_fix_alert %>,
         "EnableInsecureOutgoingConnections":  <%= @service_enable_insecure_outgoing_connections %>,
         "AllowedUntrustedInternalConnections":  "<%= @service_allowed_untrusted_internal_connections %>",
+        "EnableUserAccessTokens": <%= @service_user_access_tokens %>,
         "AllowCorsFrom":  "<%= @service_allow_cors_from %>",
         "AllowCookiesForSubdomains": <%= @service_allow_cookies_from_subdomains %>,
-        "EnableDeveloper": <%= @service_enable_developer %>,
         "SessionLengthWebInDays" : <%= @service_session_length_web_in_days %>,
         "SessionLengthMobileInDays" : <%= @service_session_length_mobile_in_days %>,
         "SessionLengthSSOInDays" : <%= @service_session_length_sso_in_days %>,
         "SessionCacheInMinutes" : <%= @service_session_cache_in_minutes %>,
+        "SessionIdleTimeoutInMinutes": <%= @service_session_idle_timeout_in_minutes %>,
+        "WebsocketSecurePort": <%= @service_websocket_secure_port %>,
+        "WebsocketPort": <%= @service_websocket_port %>,
+        "WebserverMode": "<%= @service_webserver_mode %>",
+        "EnableCustomEmoji": <%= @service_enable_custom_emoji %>,
+        "EnableEmojiPicker": <%= @service_enable_emoji_picker %>,
         "TimeBetweenUserTypingUpdatesMilliseconds" : <%= @service_time_between_user_typing_updates_milliseconds %>,
-        "EnableUserTypingMessages" : <%= @service_enable_user_typing_messages %>,
-        "EnableLinkPreviews" : <%= @service_enable_link_previews %>,
-        "EnablePostSearch" : <%= @service_enable_post_search %>,
-        "EnableUserStatuses" : <%= @service_enable_post_search %>,
-        "EnableEmojiPicker" : <%= @service_enable_emoji_picker %>,
-        "EnableChannelViewedMessages" : <%= @service_enable_channel_viewed_messages %>,
-        "EnableAPIv3" : <%= @service_enable_apiv3 %>,
-        "GoroutineHealthThreshold" : <%= @service_goroutine_health_threshold %>,
-        "EnableUserAccessTokens" : <%= @service_user_access_tokens %>,
+        "EnablePostSearch": <%= @service_enable_post_search %>,
+        "EnableUserTypingMessages": <%= @service_enable_user_typing_messages %>,
+        "EnableChannelViewedMessages": <%= @service_enable_channel_viewed_messages %>,
+        "EnableUserStatuses": <%= @service_enable_post_search %>,
         "EnablePreviewFeatures": <%= @service_enable_preview_features %>,
         "CloseUnusedDirectMessages": <%= @service_close_unused_direct_messages %>,
         "ImageProxyType": "<%= @service_image_proxy_type %>",
@@ -53,36 +57,37 @@
         "EnableUserCreation": <%= @team_enable_user_creation %>,
         "EnableOpenServer": <%= @team_enable_open_server %>,
         "RestrictCreationToDomains": "<%= @team_restrict_creation_to_domains %>",
-        "RestrictTeamNames": <%= @team_restrict_team_names %>,
         "RestrictDirectMessage": "<%= @team_restrict_direct_message %>",
-        "MaxChannelsPerTeam": <%= @team_max_channels_per_team %>,
         "EnableXToLeaveChannelsFromLHS": <%= @team_enable_x_to_leave_channels_from_lhs %>,
         "UserStatusAwayTimeout": <%= @team_user_status_away_timeout %>,
+        "MaxChannelsPerTeam": <%= @team_max_channels_per_team %>,
+        "MaxNotificationsPerChannel": <%= @team_max_notifications_per_channel %>,
         "EnableConfirmNotificationsToChannel": <%= @team_enable_confirm_notifications_to_channel %>,
-        "TeammateNameDisplay" : "<%= @team_teammate_name_display %>"
+        "TeammateNameDisplay": "<%= @team_teammate_name_display %>"
     },
     "SqlSettings": {
         "DriverName": "<%= @sql_driver_name %>",
         "DataSource": "<%= @sql_data_source %>",
         "DataSourceReplicas": [<%= @sql_data_source_replicas.map{ |dsr| "\"#{dsr}\"" }.join(',') %>],
+        "DataSourceSearchReplicas": <%= @sql_data_source_search_replicas %>,
         "MaxIdleConns": <%= @sql_max_idle_conns %>,
         "MaxOpenConns": <%= @sql_max_open_conns %>,
         "Trace": <%= @sql_trace %>,
         "AtRestEncryptKey": "<%= @sql_at_rest_encrypt_key %>",
-        "DataSourceSearchReplicas": <%= @sql_data_source_search_replicas %>,
-        "QueryTimeout" : <%= @sql_query_timeout %>
+        "QueryTimeout": <%= @sql_query_timeout %>
     },
     "LogSettings": {
         "EnableConsole": <%= @log_console_enable %>,
-        "EnableWebhookDebugging": <%= @log_enable_webhook_debugging %>,
         "ConsoleLevel": "<%= @log_console_level %>",
         "EnableFile": <%= @log_enable_file %>,
         "FileLevel": "<%= @log_file_level %>",
         "FileFormat": "<%= @log_file_format %>",
         "FileLocation": "<%= @log_file_directory %>",
+        "EnableWebhookDebugging": <%= @log_enable_webhook_debugging %>,
         "EnableDiagnostics": <%= @log_enable_diagnostics %>
     },
     "FileSettings": {
+        "EnableFileAttachments": <%= @file_enable_file_attachments %>,
         "MaxFileSize": <%= @file_max_file_size %>,
         "DriverName": "<%= @file_driver_name %>",
         "Directory": "<%= @file_directory %>",
@@ -94,12 +99,8 @@
         "AmazonS3Bucket": "<%= @file_amazon_s3_bucket %>",
         "AmazonS3Region": "<%= @file_amazon_s3_region %>",
         "AmazonS3Endpoint": "<%= @file_amazon_s3_endpoint %>",
-        "AmazonS3BucketEndpoint": "<%= @file_amazon_s3_bucket_endpoint %>",
-        "AmazonS3LocationConstraint": <%= @file_amazon_s3_location_constraint %>,
-        "AmazonS3LowercaseBucket": <%= @file_amazon_s3_lowercase_bucket %>,
         "AmazonS3SSL": <%= @file_amazon_s3_ssl %>,
-        "AmazonS3SignV2" : <%= @file_amazon_s3_sign_v2 %>,
-        "EnableFileAttachments": <%= @file_enable_file_attachments %>,
+        "AmazonS3SignV2": <%= @file_amazon_s3_sign_v2 %>,
         "AmazonS3Trace": <%= @file_amazon_s3_trace %>
     },
     "EmailSettings": {
@@ -112,6 +113,7 @@
         "FeedbackName": "<%= @email_feedback_name %>",
         "FeedbackEmail": "<%= @email_feedback_email %>",
         "FeedbackOrganization": "<%= @email_feedback_organization %>",
+        "EnableSMTPAuth": <%= @email_smtp_auth %>,
         "SMTPUsername": "<%= @email_smtp_username %>",
         "SMTPPassword": "<%= @email_smtp_password %>",
         "SMTPServer": "<%= @email_smtp_server %>",
@@ -125,7 +127,6 @@
         "EmailBatchingBufferSize": <%= @email_batching_buffer_size %>,
         "EmailBatchingInterval": <%= @email_batching_interval %>,
         "SkipServerCertificateVerification": <%= @email_skip_server_certificate_verification %>,
-        "EnableSMTPAuth": <%= @email_smtp_auth %>,
         "EmailNotificationContentType": "<%= @email_notification_content_type %>",
         "LoginButtonColor": "<%= @email_login_button_color %>",
         "LoginButtonBorderColor": "<%= @email_login_button_border_color %>",
@@ -166,6 +167,11 @@
         "DefaultClientLocale": "<%= @localization_client_locale %>",
         "AvailableLocales": "<%= @localization_available_locales %>"
     },
+    "NativeAppSetting": {
+        "AppDownloadLink": "<%= @native_app_app_download_link %>",
+        "AndroidAppDownloadLink": "<%= @native_app_android_app_download_link %>",
+        "IosAppDownloadLink": "<%= @native_app_ios_app_download_link %>"
+    },
     "WebrtcSettings": {
         "Enable": <%= @webrtc_enable %>,
         "GatewayWebsocketUrl": "<%= @webrtc_gateway_websocket_url %>",