gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add-new-config-params' into 'master' 

Add configuration support for new mattermost 3.7 settings

See merge request !1432
This commit is contained in:
DJ Mountney 2017-03-30 14:59:25 +00:00
parent 8971a5e0fe 2408ed15be
commit 3c9d693639
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/gitlab-config-template/gitlab.rb.template
View File

@ -982,7 +982,6 @@ external_url 'GENERATED_EXTERNAL_URL'
# 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
# mattermost['service_enable_incoming_webhooks'] = true
# mattermost['service_enable_post_username_override'] = true
@ -1009,6 +1008,9 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['service_forward_80_to_443'] = false
# mattermost['service_read_timeout'] = 300
# mattermost['service_write_timeout'] = 300
# mattermost['service_time_between_user_typing_updates_milliseconds'] = 5000
# mattermost['service_enable_link_previews'] = false
# mattermost['service_enable_user_typing_messages'] = true
# mattermost['team_site_name'] = "GitLab Mattermost"
# mattermost['team_max_users_per_team'] = 150

4
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -712,7 +712,6 @@ 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
default['gitlab']['mattermost']['service_enable_incoming_webhooks'] = false
default['gitlab']['mattermost']['service_enable_post_username_override'] = true
@ -739,6 +738,9 @@ default['gitlab']['mattermost']['service_lets_encrypt_cert_cache_file'] = "./con
default['gitlab']['mattermost']['service_forward_80_to_443'] = false
default['gitlab']['mattermost']['service_read_timeout'] = 300
default['gitlab']['mattermost']['service_write_timeout'] = 300
default['gitlab']['mattermost']['service_time_between_user_typing_updates_milliseconds'] = 5000
default['gitlab']['mattermost']['service_enable_link_previews'] = false
default['gitlab']['mattermost']['service_enable_user_typing_messages'] = true
default['gitlab']['mattermost']['sql_driver_name'] = 'postgres'

6
files/gitlab-cookbooks/gitlab/templates/default/config.json.erb
View File

@ -11,7 +11,6 @@
"ReadTimeout": <%= @service_read_timeout %>,
"WriteTimeout": <%= @service_write_timeout %>,
"MaximumLoginAttempts": <%= @service_maximum_login_attempts %>,
"SegmentDeveloperKey": "<%= @service_segment_developer_key %>",
"GoogleDeveloperKey": "<%= @service_google_developer_key %>",
"EnableOAuthServiceProvider": <%= @service_enable_oauth_service_provider %>,
"EnableIncomingWebhooks": <%= @service_enable_incoming_webhooks %>,
@ -29,7 +28,10 @@
"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 %>
"SessionCacheInMinutes" : <%= @service_session_cache_in_minutes %>,
"TimeBetweenUserTypingUpdatesMilliseconds" : <%= @service_time_between_user_typing_updates_milliseconds %>,
"EnableUserTypingMessages" : <%= @service_enable_link_previews %>,
"EnableLinkPreviews" : <%= @service_enable_user_typing_messages %>
},
"TeamSettings": {
"SiteName": "<%= @team_site_name %>",