From 57447d81f4004ed473aa2f8957229815f508d232 Mon Sep 17 00:00:00 2001 From: Robin Naundorf Date: Mon, 24 Jul 2017 17:41:11 +0100 Subject: [PATCH 1/4] Add configuration support for new mattermost 3.10 and 4.0 settings This adds the new settings outlined in mattermost's release notes here: https://docs.mattermost.com/administration/changelog.html#release-v3-10-2 and https://docs.mattermost.com/administration/changelog.html#release-v4-0-1 --- files/gitlab-config-template/gitlab.rb.template | 14 ++++++++------ .../gitlab/attributes/default.rb | 13 +++++++------ .../gitlab/templates/default/config.json.erb | 17 +++++++++-------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 485dbe3da..ad594ecb2 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -1040,6 +1040,11 @@ external_url 'GENERATED_EXTERNAL_URL' # mattermost['service_enable_user_typing_messages'] = true # mattermost['service_enable_post_search'] = true # mattermost['service_enable_user_statuses'] = true +# mattermost['service_enable_emoji_picker'] = true +# mattermost['service_enable_channel_viewed_messages'] = true +# mattermost['service_teammate_name_display'] = "username" +# mattermost['service_enable_apiv3'] = "true" +# mattermost['service_goroutine_health_threshold'] = -1 # mattermost['team_site_name'] = "GitLab Mattermost" # mattermost['team_max_users_per_team'] = 150 @@ -1061,6 +1066,8 @@ external_url 'GENERATED_EXTERNAL_URL' # mattermost['sql_max_open_conns'] = 10 # mattermost['sql_trace'] = false # mattermost['sql_data_source_search_replicas'] = [] +# mattermost['sql_query_timeout'] = 30 + # mattermost['log_file_directory'] = '/var/log/gitlab/mattermost' # mattermost['log_console_enable'] = true @@ -1105,12 +1112,6 @@ external_url 'GENERATED_EXTERNAL_URL' # mattermost['file_driver_name'] = "local" # mattermost['file_directory'] = "/var/opt/gitlab/mattermost/data" # mattermost['file_enable_public_link'] = true -# mattermost['file_thumbnail_width'] = 120 -# mattermost['file_thumbnail_height'] = 100 -# mattermost['file_preview_width'] = 1024 -# mattermost['file_preview_height'] = 0 -# mattermost['file_profile_width'] = 128 -# mattermost['file_profile_height'] = 128 # mattermost['file_initial_font'] = 'luximbi.ttf' # mattermost['file_amazon_s3_access_key_id'] = nil # mattermost['file_amazon_s3_bucket'] = nil @@ -1121,6 +1122,7 @@ external_url 'GENERATED_EXTERNAL_URL' # 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 # mattermost['ratelimit_enable_rate_limiter'] = false diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index fa4137335..ffa32afc3 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -721,6 +721,11 @@ default['gitlab']['mattermost']['service_enable_link_previews'] = false default['gitlab']['mattermost']['service_enable_user_typing_messages'] = true default['gitlab']['mattermost']['service_enable_post_search'] = true default['gitlab']['mattermost']['service_enable_user_statuses'] = true +default['gitlab']['mattermost']['service_enable_emoji_picker'] = true +default['gitlab']['mattermost']['service_enable_channel_viewed_messages'] = true +default['gitlab']['mattermost']['service_teammate_name_display'] = "username" +default['gitlab']['mattermost']['service_enable_apiv3'] = "true" +default['gitlab']['mattermost']['service_goroutine_health_threshold'] = -1 default['gitlab']['mattermost']['sql_driver_name'] = 'postgres' default['gitlab']['mattermost']['sql_data_source'] = nil @@ -729,6 +734,7 @@ default['gitlab']['mattermost']['sql_max_idle_conns'] = 10 default['gitlab']['mattermost']['sql_max_open_conns'] = 10 default['gitlab']['mattermost']['sql_trace'] = false default['gitlab']['mattermost']['sql_data_source_search_replicas'] = [] +default['gitlab']['mattermost']['sql_query_timeout'] = 30 # default['gitlab']['mattermost']['gitlab'] = {'Allow' => true, 'Secret' => "123", 'Id' => "123", "AuthEndpoint" => "aa", "TokenEndpoint" => "bb", "UserApiEndpoint" => "cc" } default['gitlab']['mattermost']['gitlab'] = {} @@ -737,12 +743,6 @@ default['gitlab']['mattermost']['file_max_file_size'] = 52428800 default['gitlab']['mattermost']['file_driver_name'] = "local" default['gitlab']['mattermost']['file_directory'] = "/var/opt/gitlab/mattermost/data" default['gitlab']['mattermost']['file_enable_public_link'] = true -default['gitlab']['mattermost']['file_thumbnail_width'] = 120 -default['gitlab']['mattermost']['file_thumbnail_height'] = 100 -default['gitlab']['mattermost']['file_preview_width'] = 1024 -default['gitlab']['mattermost']['file_preview_height'] = 0 -default['gitlab']['mattermost']['file_profile_width'] = 128 -default['gitlab']['mattermost']['file_profile_height'] = 128 default['gitlab']['mattermost']['file_initial_font'] = 'luximbi.ttf' default['gitlab']['mattermost']['file_amazon_s3_access_key_id'] = nil default['gitlab']['mattermost']['file_amazon_s3_bucket'] = nil @@ -753,6 +753,7 @@ default['gitlab']['mattermost']["file_amazon_s3_bucket_endpoint"] = nil default['gitlab']['mattermost']["file_amazon_s3_location_constraint"] = false default['gitlab']['mattermost']["file_amazon_s3_lowercase_bucket"] = false default['gitlab']['mattermost']["file_amazon_s3_ssl"] = true +default['gitlab']['mattermost']["file_amazon_s3_sign_v2"] = false default['gitlab']['mattermost']['file_enable_file_attachments'] = true default['gitlab']['mattermost']['email_enable_sign_up_with_email'] = false diff --git a/files/gitlab-cookbooks/gitlab/templates/default/config.json.erb b/files/gitlab-cookbooks/gitlab/templates/default/config.json.erb index 0666828a0..edd3ab457 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/config.json.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/config.json.erb @@ -33,7 +33,12 @@ "EnableUserTypingMessages" : <%= @service_enable_user_typing_messages %>, "EnableLinkPreviews" : <%= @service_enable_link_previews %>, "EnablePostSearch" : <%= @service_enable_post_search %>, - "EnableUserStatuses" : <%= @service_enable_post_search %> + "EnableUserStatuses" : <%= @service_enable_post_search %>, + "EnableEmojiPicker" : <%= @service_enable_emoji_picker %>, + "EnableChannelViewedMessages" : <%= @service_enable_channel_viewed_messages %>, + "TeammateNameDisplay" : <%= @service_teammate_name_display %>, + "EnableAPIv3" : <%= @service_enable_apiv3 %>, + "GoroutineHealthThreshold" : <%= @service_goroutine_health_threshold %> }, "TeamSettings": { "SiteName": "<%= @team_site_name %>", @@ -55,7 +60,8 @@ "MaxOpenConns": <%= @sql_max_open_conns %>, "Trace": <%= @sql_trace %>, "AtRestEncryptKey": "<%= @sql_at_rest_encrypt_key %>", - "DataSourceSearchReplicas": <%= @sql_data_source_search_replicas %> + "DataSourceSearchReplicas": <%= @sql_data_source_search_replicas %>, + "QueryTimeout" : <%= @sql_query_timeout %> }, "LogSettings": { "EnableConsole": <%= @log_console_enable %>, @@ -73,12 +79,6 @@ "Directory": "<%= @file_directory %>", "EnablePublicLink": <%= @file_enable_public_link %>, "PublicLinkSalt": "<%= @file_public_link_salt %>", - "ThumbnailWidth": <%= @file_thumbnail_width %>, - "ThumbnailHeight": <%= @file_thumbnail_height %>, - "PreviewWidth": <%= @file_preview_width %>, - "PreviewHeight": <%= @file_preview_height %>, - "ProfileWidth": <%= @file_profile_width %>, - "ProfileHeight": <%= @file_profile_height %>, "InitialFont": "<%= @file_initial_font %>", "AmazonS3AccessKeyId": "<%= @file_amazon_s3_access_key_id %>", "AmazonS3SecretAccessKey": "<%= @file_amazon_s3_secret_access_key %>", @@ -89,6 +89,7 @@ "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 %> }, "EmailSettings": { -- GitLab From 981ea4f5f80643894e739c726ce2d107ef570514 Mon Sep 17 00:00:00 2001 From: Robin Naundorf Date: Mon, 24 Jul 2017 19:26:06 +0100 Subject: [PATCH 2/4] fix wrong type --- files/gitlab-config-template/gitlab.rb.template | 2 +- files/gitlab-cookbooks/gitlab/attributes/default.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index ad594ecb2..f0afc03e7 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -1043,7 +1043,7 @@ external_url 'GENERATED_EXTERNAL_URL' # mattermost['service_enable_emoji_picker'] = true # mattermost['service_enable_channel_viewed_messages'] = true # mattermost['service_teammate_name_display'] = "username" -# mattermost['service_enable_apiv3'] = "true" +# mattermost['service_enable_apiv3'] = true # mattermost['service_goroutine_health_threshold'] = -1 # mattermost['team_site_name'] = "GitLab Mattermost" diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index ffa32afc3..61d48029d 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -724,7 +724,7 @@ default['gitlab']['mattermost']['service_enable_user_statuses'] = true default['gitlab']['mattermost']['service_enable_emoji_picker'] = true default['gitlab']['mattermost']['service_enable_channel_viewed_messages'] = true default['gitlab']['mattermost']['service_teammate_name_display'] = "username" -default['gitlab']['mattermost']['service_enable_apiv3'] = "true" +default['gitlab']['mattermost']['service_enable_apiv3'] = true default['gitlab']['mattermost']['service_goroutine_health_threshold'] = -1 default['gitlab']['mattermost']['sql_driver_name'] = 'postgres' -- GitLab From c859680ee92d0b9c049c294657557192e25c5961 Mon Sep 17 00:00:00 2001 From: Robin Naundorf Date: Mon, 24 Jul 2017 20:18:39 +0100 Subject: [PATCH 3/4] fix missing parantheses --- files/gitlab-cookbooks/gitlab/templates/default/config.json.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/gitlab-cookbooks/gitlab/templates/default/config.json.erb b/files/gitlab-cookbooks/gitlab/templates/default/config.json.erb index edd3ab457..80aced729 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/config.json.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/config.json.erb @@ -36,7 +36,7 @@ "EnableUserStatuses" : <%= @service_enable_post_search %>, "EnableEmojiPicker" : <%= @service_enable_emoji_picker %>, "EnableChannelViewedMessages" : <%= @service_enable_channel_viewed_messages %>, - "TeammateNameDisplay" : <%= @service_teammate_name_display %>, + "TeammateNameDisplay" : "<%= @service_teammate_name_display %>", "EnableAPIv3" : <%= @service_enable_apiv3 %>, "GoroutineHealthThreshold" : <%= @service_goroutine_health_threshold %> }, -- GitLab From 69ba02766230de7cbc0d2d2763f9465d78ece574 Mon Sep 17 00:00:00 2001 From: Robin Naundorf Date: Mon, 24 Jul 2017 22:35:42 +0100 Subject: [PATCH 4/4] Change service_teammate_name_display default to 'full_name' --- files/gitlab-cookbooks/gitlab/attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 61d48029d..3db6425b9 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -723,7 +723,7 @@ default['gitlab']['mattermost']['service_enable_post_search'] = true default['gitlab']['mattermost']['service_enable_user_statuses'] = true default['gitlab']['mattermost']['service_enable_emoji_picker'] = true default['gitlab']['mattermost']['service_enable_channel_viewed_messages'] = true -default['gitlab']['mattermost']['service_teammate_name_display'] = "username" +default['gitlab']['mattermost']['service_teammate_name_display'] = "full_name" default['gitlab']['mattermost']['service_enable_apiv3'] = true default['gitlab']['mattermost']['service_goroutine_health_threshold'] = -1 -- GitLab