Commit 79ed4a63 authored by DJ Mountney's avatar DJ Mountney

Added mattermost config options that were introduced in version 3.4

parent 87b7a780
......@@ -723,6 +723,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['service_address'] = "127.0.0.1"
# mattermost['service_port'] = "8065"
# mattermost['service_site_url'] = nil
# mattermost['service_maximum_login_attempts'] = 10
# mattermost['service_segment_developer_key'] = nil
# mattermost['service_google_developer_key'] = nil
......@@ -768,6 +769,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['log_enable_file'] = false
# mattermost['log_file_level'] = 'INFO'
# mattermost['log_file_format'] = nil
# mattermost['log_enable_diagnostics'] = true
# mattermost['gitlab_enable'] = false
# mattermost['gitlab_id'] = "12345656"
......@@ -795,6 +797,9 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['email_send_push_notifications'] = true
# mattermost['email_push_notification_server'] = ""
# mattermost['email_push_notification_contents'] = "generic"
# mattermost['email_enable_batching'] = false
# mattermost['email_batching_buffer_size'] = 256
# mattermost['email_batching_interval'] = 30
# mattermost['file_max_file_size'] = 52428800
# mattermost['file_driver_name'] = "local"
......
......@@ -737,11 +737,13 @@ default['gitlab']['mattermost']['log_console_level'] = 'INFO'
default['gitlab']['mattermost']['log_enable_file'] = true
default['gitlab']['mattermost']['log_file_level'] = 'ERROR'
default['gitlab']['mattermost']['log_file_format'] = nil
default['gitlab']['mattermost']['log_enable_diagnostics'] = true
default['gitlab']['mattermost']['service_use_ssl'] = false
default['gitlab']['mattermost']['service_address'] = "127.0.0.1"
default['gitlab']['mattermost']['service_port'] = "8065"
default['gitlab']['mattermost']['service_site_url'] = nil
default['gitlab']['mattermost']['service_maximum_login_attempts'] = 10
default['gitlab']['mattermost']['service_segment_developer_key'] = nil
default['gitlab']['mattermost']['service_google_developer_key'] = nil
......@@ -810,6 +812,9 @@ default['gitlab']['mattermost']['email_connection_security'] = nil
default['gitlab']['mattermost']['email_send_push_notifications'] = false
default['gitlab']['mattermost']['email_push_notification_server'] = nil
default['gitlab']['mattermost']['email_push_notification_contents'] = "generic"
default['gitlab']['mattermost']['email_enable_batching'] = false
default['gitlab']['mattermost']['email_batching_buffer_size'] = 256
default['gitlab']['mattermost']['email_batching_interval'] = 30
default['gitlab']['mattermost']['ratelimit_enable_rate_limiter'] = true
default['gitlab']['mattermost']['ratelimit_per_sec'] = 10
......
{
"ServiceSettings": {
"SiteURL": "<%= @service_site_url %>",
"ListenAddress": "<%= @service_address %>:<%= @service_port %>",
"MaximumLoginAttempts": <%= @service_maximum_login_attempts %>,
"SegmentDeveloperKey": "<%= @service_segment_developer_key %>",
......@@ -48,7 +49,8 @@
"EnableFile": <%= @log_enable_file %>,
"FileLevel": "<%= @log_file_level %>",
"FileFormat": "<%= @log_file_format %>",
"FileLocation": "<%= @log_file_directory %>/mattermost.log"
"FileLocation": "<%= @log_file_directory %>/mattermost.log",
"EnableDiagnostics": <%= @log_enable_diagnostics %>
},
"FileSettings": {
"MaxFileSize": <%= @file_max_file_size %>,
......@@ -90,7 +92,10 @@
"PasswordResetSalt": "<%= @email_password_reset_salt %>",
"SendPushNotifications": <%= @email_send_push_notifications %>,
"PushNotificationServer": "<%= @email_push_notification_server %>",
"PushNotificationContents": "<%= @email_push_notification_contents %>"
"PushNotificationContents": "<%= @email_push_notification_contents %>",
"EnableEmailBatching": <%= @email_enable_batching %>,
"EmailBatchingBufferSize": <%= @email_batching_buffer_size %>,
"EmailBatchingInterval": <%= @email_batching_interval %>
},
"RateLimitSettings": {
"EnableRateLimiter": <%= @ratelimit_enable_rate_limiter %>,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment