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 'mattermost_1.1.0' into 'master' 

Update to Mattermost 1.1.1

Fixes #868 

See merge request !514
This commit is contained in:
Marin Jankovski 2015-10-21 08:24:33 +00:00
parent 3021ed9fa9 b4c4221759
commit 38ef5d7b60
8 changed files with 185 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/software/mattermost.rb
View File

@ -17,10 +17,10 @@
#
name "mattermost"
default_version "v0.7.1"
default_version "v1.1.1"
source url: "https://github.com/mattermost/platform/releases/download/#{version}/mattermost.tar.gz",
md5: '644bfdec4664c39597e04e57584afa60'
md5: '0668e384bdaa6a58f4c6ff477791a227'
build do
move "bin/platform", "#{install_dir}/embedded/bin/mattermost"

2
doc/gitlab-mattermost/README.md
View File

@ -51,7 +51,7 @@ gitlab_rails['enable'] = false
where `Secret` and `Id` are `application secret` and `application id` received when creating new `Application` authorization in GitLab admin section.
Optionally, you can set `mattermost['service_disable_email_signup'] = true` to force all users to sign-up with GitLab only. See Mattermost [documentation on GitLab SSO](https://github.com/mattermost/platform/blob/master/doc/integrations/sso/gitlab-sso.md).
Optionally, you can set `mattermost['email_enable_sign_up_with_email'] = false` to force all users to sign-up with GitLab only. See Mattermost [documentation on GitLab SSO](https://github.com/mattermost/platform/blob/master/doc/integrations/sso/gitlab-sso.md).
## Manually (re)authorising GitLab Mattermost with GitLab

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

@ -674,24 +674,26 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['home'] = '/var/opt/gitlab/mattermost'
# mattermost['database_name'] = 'mattermost_production'
# mattermost['log_file_directory'] = '/var/log/gitlab/mattermost'
# mattermost['log_console_enable'] = true
# mattermost['log_console_level'] = 'INFO'
# mattermost['log_file_enable'] = false
# mattermost['log_file_level'] = 'INFO'
# mattermost['log_file_format'] = nil
# mattermost['service_site_name'] = "GitLab Mattermost"
# mattermost['service_mode'] = 'beta'
# mattermost['service_allow_testing'] = false
# mattermost['service_use_ssl'] = false
# mattermost['service_port'] = "8065"
# mattermost['service_version'] = "developer"
# mattermost['service_analytics_url'] = nil
# mattermost['service_use_local_storage'] = true
# mattermost['service_storage_directory'] = "/var/opt/gitlab/mattermost/data"
# mattermost['service_allowed_login_attempts'] = 10
# mattermost['service_disable_email_signup'] = true
# 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'] = false
# mattermost['service_enable_post_icon_override'] = false
# mattermost['service_enable_testing'] = false
# mattermost['service_enable_security_fix_alert'] = true
# mattermost['team_site_name'] = "GitLab Mattermost"
# mattermost['team_max_users_per_team'] = 150
# mattermost['team_enable_team_creation'] = true
# mattermost['team_enable_user_creation'] = true
# mattermost['team_allow_public_link'] = true
# mattermost['team_allow_valet_default'] = false
# mattermost['team_default_color'] = '#2389D7'
# mattermost['team_restrict_creation_to_domains'] = "gmail.com"
# mattermost['sql_driver_name'] = 'mysql'
# mattermost['sql_data_source'] = "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"
@ -700,51 +702,54 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['sql_max_open_conns'] = 10
# mattermost['sql_trace'] = false
# mattermost['oauth'] = {'gitlab' => {'Allow' => true, 'Secret' => "123", 'Id' => "123", "AuthEndpoint" => "aa", "TokenEndpoint" => "bb", "UserApiEndpoint" => "cc", "Scope" => "" }}
# mattermost['aws'] = {'S3AccessKeyId' => '123', 'S3SecretAccessKey' => '123', 'S3Bucket' => 'aa', 'S3Region' => 'bb'}
# mattermost['image_thumbnail_width'] = 120
# mattermost['image_thumbnail_height'] = 100
# mattermost['image_preview_width'] = 1024
# mattermost['image_preview_height'] = 0
# mattermost['image_profile_width'] = 128
# mattermost['image_profile_height'] = 128
# mattermost['image_initial_font'] = 'luximbi.ttf'
# mattermost['log_file_directory'] = '/var/log/gitlab/mattermost'
# mattermost['log_console_enable'] = true
# mattermost['log_console_level'] = 'INFO'
# mattermost['log_enable_file'] = false
# mattermost['log_file_level'] = 'INFO'
# mattermost['log_file_format'] = nil
# mattermost['email_by_pass_email'] = true
# mattermost['gitlab'] = {'Enable' => true, 'Secret' => "123", 'Id' => "123", "AuthEndpoint" => "aa", "TokenEndpoint" => "bb", "UserApiEndpoint" => "cc", "Scope" => "" }
# mattermost['aws'] = {'S3AccessKeyId' => '123', 'S3SecretAccessKey' => '123', 'S3Bucket' => 'aa', 'S3Region' => 'bb'}
# mattermost['email_enable_sign_up_with_email'] = true
# mattermost['email_send_email_notifications'] = false
# mattermost['email_require_email_verification'] = false
# mattermost['email_smtp_username'] = nil
# mattermost['email_smtp_password'] = nil
# mattermost['email_smtp_server'] = nil
# mattermost['email_use_tls'] = false
# mattermost['email_use_start_tls'] = false
# mattermost['email_feedback_email'] = nil
# mattermost['email_feedback_name'] = nil
# mattermost['email_smtp_port'] = nil
# mattermost['email_connection_security'] = nil
# mattermost['email_apple_push_server'] = nil
# mattermost['email_apple_push_cert_public'] = nil
# mattermost['email_apple_push_cert_private'] = nil
# mattermost['ratelimit_use_rate_limiter'] = true
# 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
# mattermost['file_amazon_s3_secret_access_key'] = nil
# mattermost['file_amazon_s3_bucket'] = nil
# mattermost['ratelimit_enable_rate_limiter'] = true
# mattermost['ratelimit_per_sec'] = 10
# mattermost['ratelimit_memory_store_size'] = 10000
# mattermost['ratelimit_vary_by_remote_addr'] = true
# mattermost['ratelimit_vary_by_header'] = nil
# mattermost['privacy_show_email_address'] = true
# mattermost['privacy_show_phone_number'] = true
# mattermost['privacy_show_skype_id'] = true
# mattermost['privacy_show_full_name'] = true
# mattermost['team_max_users_per_team'] = 150
# mattermost['team_allow_public_link'] = true
# mattermost['team_allow_valet_default'] = false
# mattermost['team_terms_link'] = '/static/help/configure_links.html'
# mattermost['team_privacy_link'] = '/static/help/configure_links.html'
# mattermost['team_about_link'] = '/static/help/configure_links.html'
# mattermost['team_help_link'] = '/static/help/configure_links.html'
# mattermost['team_report_problem_link'] = '/static/help/configure_links.html'
# mattermost['team_tour_link'] = '/static/help/configure_links.html'
# mattermost['team_default_color'] = '#2389D7'
# mattermost['team_disable_team_creation'] = true
# mattermost['team_restrict_creation_to_domains'] = "gmail.com"
####################
# Mattermost NGINX #

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

@ -561,21 +561,22 @@ default['gitlab']['mattermost']['database_name'] = 'mattermost_production'
default['gitlab']['mattermost']['log_file_directory'] = '/var/log/gitlab/mattermost'
default['gitlab']['mattermost']['log_console_enable'] = true
default['gitlab']['mattermost']['log_console_level'] = 'INFO'
default['gitlab']['mattermost']['log_file_enable'] = false
default['gitlab']['mattermost']['log_enable_file'] = false
default['gitlab']['mattermost']['log_file_level'] = 'INFO'
default['gitlab']['mattermost']['log_file_format'] = nil
default['gitlab']['mattermost']['service_site_name'] = "GitLab Mattermost"
default['gitlab']['mattermost']['service_mode'] = 'beta'
default['gitlab']['mattermost']['service_allow_testing'] = false
default['gitlab']['mattermost']['service_use_ssl'] = false
default['gitlab']['mattermost']['service_port'] = "8065"
default['gitlab']['mattermost']['service_version'] = "developer"
default['gitlab']['mattermost']['service_analytics_url'] = nil
default['gitlab']['mattermost']['service_use_local_storage'] = true
default['gitlab']['mattermost']['service_storage_directory'] = "/var/opt/gitlab/mattermost/data"
default['gitlab']['mattermost']['service_allowed_login_attempts'] = 10
default['gitlab']['mattermost']['service_disable_email_signup'] = false
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'] = true
default['gitlab']['mattermost']['service_enable_post_username_override'] = false
default['gitlab']['mattermost']['service_enable_post_icon_override'] = false
default['gitlab']['mattermost']['service_enable_testing'] = false
default['gitlab']['mattermost']['service_enable_security_fix_alert'] = true
default['gitlab']['mattermost']['sql_driver_name'] = 'postgres'
default['gitlab']['mattermost']['sql_data_source'] = nil
@ -584,54 +585,62 @@ 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']['oauth'] = {'gitlab' => {'Allow' => true, 'Secret' => "123", 'Id' => "123", "AuthEndpoint" => "aa", "TokenEndpoint" => "bb", "UserApiEndpoint" => "cc" }}
default['gitlab']['mattermost']['oauth'] = {}
# default['gitlab']['mattermost']['aws'] = {'S3AccessKeyId' => '123', 'S3SecretAccessKey' => '123', 'S3Bucket' => 'aa', 'S3Region' => 'bb'}
default['gitlab']['mattermost']['aws'] = {}
default['gitlab']['mattermost']['image_thumbnail_width'] = 120
default['gitlab']['mattermost']['image_thumbnail_height'] = 100
default['gitlab']['mattermost']['image_preview_width'] = 1024
default['gitlab']['mattermost']['image_preview_height'] = 0
default['gitlab']['mattermost']['image_profile_width'] = 128
default['gitlab']['mattermost']['image_profile_height'] = 128
default['gitlab']['mattermost']['image_initial_font'] = 'luximbi.ttf'
# default['gitlab']['mattermost']['gitlab'] = {'Allow' => true, 'Secret' => "123", 'Id' => "123", "AuthEndpoint" => "aa", "TokenEndpoint" => "bb", "UserApiEndpoint" => "cc" }
default['gitlab']['mattermost']['gitlab'] = {}
default['gitlab']['mattermost']['email_by_pass_email'] = true
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
default['gitlab']['mattermost']['file_amazon_s3_secret_access_key'] = nil
default['gitlab']['mattermost']['file_amazon_s3_bucket'] = nil
default['gitlab']['mattermost']['email_enable_sign_up_with_email'] = true
default['gitlab']['mattermost']['email_send_email_notifications'] = false
default['gitlab']['mattermost']['email_require_email_verification'] = false
default['gitlab']['mattermost']['email_smtp_username'] = nil
default['gitlab']['mattermost']['email_smtp_password'] = nil
default['gitlab']['mattermost']['email_smtp_server'] = nil
default['gitlab']['mattermost']['email_use_tls'] = false
default['gitlab']['mattermost']['email_use_start_tls'] = false
default['gitlab']['mattermost']['email_feedback_email'] = nil
default['gitlab']['mattermost']['email_feedback_name'] = nil
default['gitlab']['mattermost']['email_smtp_port'] = nil
default['gitlab']['mattermost']['email_connection_security'] = nil
default['gitlab']['mattermost']['email_apple_push_server'] = nil
default['gitlab']['mattermost']['email_apple_push_cert_public'] = nil
default['gitlab']['mattermost']['email_apple_push_cert_private'] = nil
default['gitlab']['mattermost']['ratelimit_use_rate_limiter'] = true
default['gitlab']['mattermost']['ratelimit_enable_rate_limiter'] = true
default['gitlab']['mattermost']['ratelimit_per_sec'] = 10
default['gitlab']['mattermost']['ratelimit_memory_store_size'] = 10000
default['gitlab']['mattermost']['ratelimit_vary_by_remote_addr'] = true
default['gitlab']['mattermost']['ratelimit_vary_by_header'] = nil
default['gitlab']['mattermost']['privacy_show_email_address'] = true
default['gitlab']['mattermost']['privacy_show_phone_number'] = true
default['gitlab']['mattermost']['privacy_show_skype_id'] = true
default['gitlab']['mattermost']['privacy_show_full_name'] = true
default['gitlab']['mattermost']['team_site_name'] = "GitLab Mattermost"
default['gitlab']['mattermost']['team_enable_team_creation'] = true
default['gitlab']['mattermost']['team_enable_user_creation'] = true
default['gitlab']['mattermost']['team_max_users_per_team'] = 150
default['gitlab']['mattermost']['team_allow_public_link'] = true
default['gitlab']['mattermost']['team_allow_valet_default'] = false
default['gitlab']['mattermost']['team_terms_link'] = '/static/help/configure_links.html'
default['gitlab']['mattermost']['team_privacy_link'] = '/static/help/configure_links.html'
default['gitlab']['mattermost']['team_about_link'] = '/static/help/configure_links.html'
default['gitlab']['mattermost']['team_help_link'] = '/static/help/configure_links.html'
default['gitlab']['mattermost']['team_report_problem_link'] = '/static/help/configure_links.html'
default['gitlab']['mattermost']['team_tour_link'] = '/static/help/configure_links.html'
default['gitlab']['mattermost']['team_default_color'] = '#2389D7'
default['gitlab']['mattermost']['team_disable_team_creation'] = false
default['gitlab']['mattermost']['team_restrict_creation_to_domains'] = nil
default['gitlab']['mattermost']['gitlab_enable'] = false
default['gitlab']['mattermost']['gitlab_secret'] = nil
default['gitlab']['mattermost']['gitlab_id'] = nil
default['gitlab']['mattermost']['gitlab_scope'] = nil
default['gitlab']['mattermost']['gitlab_auth_endpoint'] = nil
default['gitlab']['mattermost']['gitlab_token_endpoint'] = nil
default['gitlab']['mattermost']['gitlab_user_api_endpoint'] = nil
####
# Mattermost NGINX
####

8
files/gitlab-cookbooks/gitlab/libraries/gitlab.rb
View File

@ -85,10 +85,10 @@ module Gitlab
end
Gitlab['gitlab_ci']['db_key_base'] ||= generate_hex(64)
Gitlab['mattermost']['service_invite_salt'] ||= generate_hex(64)
Gitlab['mattermost']['service_public_link_salt'] ||= generate_hex(64)
Gitlab['mattermost']['service_reset_salt'] ||= generate_hex(64)
Gitlab['mattermost']['sql_at_rest_encrypt_key'] ||= generate_hex(64)
Gitlab['mattermost']['email_invite_salt'] ||= generate_hex(16)
Gitlab['mattermost']['file_public_link_salt'] ||= generate_hex(16)
Gitlab['mattermost']['email_password_reset_salt'] ||= generate_hex(16)
Gitlab['mattermost']['sql_at_rest_encrypt_key'] ||= generate_hex(16)
# Note: Besides the section below, gitlab-secrets.json will also change
# in CiHelper in libraries/helper.rb

45
files/gitlab-cookbooks/gitlab/libraries/helper.rb
View File

@ -214,30 +214,19 @@ class MattermostHelper
app_id, app_secret = o.stdout.chomp.split(" ")
gitlab_url = gitlab_external_url.chomp("/")
Gitlab['mattermost']['oauth'] = {} unless Gitlab['mattermost']['oauth']
Gitlab['mattermost']['oauth']['gitlab'] = { 'Allow' => true,
'Secret' => app_secret,
'Id' => app_id,
'AuthEndpoint' => "#{gitlab_url}/oauth/authorize",
'TokenEndpoint' => "#{gitlab_url}/oauth/token",
'UserApiEndpoint' => "#{gitlab_url}/api/v3/user",
'Scope' => ""
}
Gitlab['mattermost']['gitlab_enable'] = true
Gitlab['mattermost']['gitlab_secret'] = app_secret
Gitlab['mattermost']['gitlab_id'] = app_id
Gitlab['mattermost']['gitlab_scope'] = ""
Gitlab['mattermost']['gitlab_auth_endpoint'] = "#{gitlab_url}/oauth/authorize"
Gitlab['mattermost']['gitlab_token_endpoint'] = "#{gitlab_url}/oauth/token"
Gitlab['mattermost']['gitlab_user_api_endpoint'] = "#{gitlab_url}/api/v3/user"
SecretsHelper.write_to_gitlab_secrets
info("Updated the gitlab-secrets.json file.")
else
warn("Something went wrong while trying to update gitlab-secrets.json. Check the file permissions and try reconfiguring again.")
end
{ 'Allow' => true,
'Secret' => app_secret,
'Id' => app_id,
'AuthEndpoint' => "#{gitlab_url}/oauth/authorize",
'TokenEndpoint' => "#{gitlab_url}/oauth/token",
'UserApiEndpoint' => "#{gitlab_url}/api/v3/user",
'Scope' => ""
}
end
end
@ -276,9 +265,9 @@ class SecretsHelper
'db_key_base' => Gitlab['gitlab_ci']['db_key_base'],
},
'mattermost' => {
'service_invite_salt' => Gitlab['mattermost']['service_invite_salt'],
'service_public_link_salt' => Gitlab['mattermost']['service_public_link_salt'],
'service_reset_salt' => Gitlab['mattermost']['service_reset_salt'],
'email_invite_salt' => Gitlab['mattermost']['email_invite_salt'],
'file_public_link_salt' => Gitlab['mattermost']['file_public_link_salt'],
'email_password_reset_salt' => Gitlab['mattermost']['email_password_reset_salt'],
'sql_at_rest_encrypt_key' => Gitlab['mattermost']['sql_at_rest_encrypt_key']
}
}
@ -294,11 +283,15 @@ class SecretsHelper
secret_tokens['gitlab_ci'].merge!(ci_auth)
end
if Gitlab['mattermost']['oauth'] && Gitlab['mattermost']['oauth']['gitlab']
gitlab_oauth = { 'oauth' =>
{
'gitlab' => Gitlab['mattermost']['oauth']['gitlab']
}
if Gitlab['mattermost']['gitlab_enable']
gitlab_oauth = {
'gitlab_enable' => Gitlab['mattermost']['gitlab_enable'],
'gitlab_secret' => Gitlab['mattermost']['gitlab_secret'],
'gitlab_id' => Gitlab['mattermost']['gitlab_id'],
'gitlab_scope' => Gitlab['mattermost']['gitlab_scope'],
'gitlab_auth_endpoint' => Gitlab['mattermost']['gitlab_auth_endpoint'],
'gitlab_token_endpoint' => Gitlab['mattermost']['gitlab_token_endpoint'],
'gitlab_user_api_endpoint' => Gitlab['mattermost']['gitlab_user_api_endpoint']
}
secret_tokens['mattermost'].merge!(gitlab_oauth)
end

20
files/gitlab-cookbooks/gitlab/recipes/mattermost.rb
View File

@ -21,7 +21,7 @@ mattermost_user = gitlab['mattermost']['username']
mattermost_group = gitlab['mattermost']['group']
mattermost_home = gitlab['mattermost']['home']
mattermost_log_dir = gitlab['mattermost']['log_file_directory']
mattermost_storage_directory = gitlab['mattermost']['service_storage_directory']
mattermost_storage_directory = gitlab['mattermost']['file_directory']
postgresql_socket_dir = gitlab['postgresql']['unix_socket_directory']
pg_port = gitlab['postgresql']['port']
pg_user = gitlab['postgresql']['username']
@ -83,21 +83,17 @@ end
###
# Try connecting to GitLab only if it is enabled
database_ready = pg_helper.is_running? && pg_helper.database_exists?(gitlab['gitlab-rails']['db_database'])
gitlab_oauth = if gitlab['mattermost']['oauth']['gitlab']
gitlab['mattermost']['oauth']['gitlab']
else
if gitlab['gitlab-rails']['enable'] && database_ready
MattermostHelper.authorize_with_gitlab(Gitlab['external_url'])
else
{}
end
end
oauth_attributes = gitlab['mattermost']['oauth'].to_hash.merge('gitlab' => gitlab_oauth)
unless gitlab['mattermost']['gitlab_enable']
if gitlab['gitlab-rails']['enable'] && database_ready
MattermostHelper.authorize_with_gitlab(Gitlab['external_url'])
end
end
template "#{mattermost_home}/config.json" do
source "config.json.erb"
owner mattermost_user
variables gitlab['mattermost'].to_hash.merge(gitlab['postgresql']).to_hash.merge('oauth' => oauth_attributes)
variables gitlab['mattermost'].to_hash.merge(gitlab['postgresql']).to_hash
mode "0644"
notifies :restart, "service[mattermost]"
end

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

@ -1,29 +1,22 @@
{
"LogSettings": {
"ConsoleEnable": <%= @log_console_enable %>,
"ConsoleLevel": "<%= @log_console_level %>",
"FileEnable": <%= @log_file_enable %>,
"FileLevel": "<%= @log_file_level %>",
"FileFormat": "<%= @log_file_format %>",
"FileLocation": "<%= @log_file_directory %>/mattermost.log"
},
"ServiceSettings": {
"SiteName": "<%= @service_site_name %>",
"Mode" : "<%= @service_mode %>",
"AllowTesting" : <%= @service_allow_testing %>,
"UseSSL": <%= @service_use_ssl %>,
"Port": "<%= @service_port %>",
"Version": "<%= @service_version %>",
"InviteSalt": "<%= @service_invite_salt %>",
"PublicLinkSalt": "<%= @service_public_link_salt %>",
"ResetSalt": "<%= @service_reset_salt %>",
"AnalyticsUrl": "<%= @service_analytics_url %>",
"UseLocalStorage": <%= @service_use_local_storage %>,
"StorageDirectory": "<%= @service_storage_directory %>",
"AllowedLoginAttempts": <%= @service_allowed_login_attempts %>,
"DisableEmailSignUp": <%= @service_disable_email_signup %>
"ListenAddress": ":<%= @service_port %>",
"MaximumLoginAttempts": <%= @service_maximum_login_attempts %>,
"SegmentDeveloperKey": "<%= @service_segment_developer_key %>",
"GoogleDeveloperKey": "<%= @service_google_developer_key %>",
"EnableIncomingWebhooks": <%= @service_enable_incoming_webhooks %>,
"EnablePostUsernameOverride": <%= @service_enable_post_username_override %>,
"EnablePostIconOverride": <%= @service_enable_post_icon_override %>,
"EnableTesting": <%= @service_enable_testing %>,
"EnableSecurityFixAlert": <%= @service_enable_security_fix_alert %>
},
"TeamSettings": {
"SiteName": "<%= @team_site_name %>",
"MaxUsersPerTeam": <%= @team_max_users_per_team %>,
"EnableTeamCreation": <%= @team_enable_team_creation %>,
"EnableUserCreation": <%= @team_enable_user_creation %>,
"RestrictCreationToDomains": "<%= @team_restrict_creation_to_domains %>"
},
"SSOSettings": <%= @oauth.to_json %>,
"SqlSettings": {
"DriverName": "<%= @sql_driver_name %>",
"DataSource": "<%= @sql_data_source %>",
@ -33,31 +26,48 @@
"Trace": <%= @sql_trace %>,
"AtRestEncryptKey": "<%= @sql_at_rest_encrypt_key %>"
},
"AWSSettings": <%= @aws.to_json %>,
"ImageSettings": {
"ThumbnailWidth": <%= @image_thumbnail_width %>,
"ThumbnailHeight": <%= @image_thumbnail_height %>,
"PreviewWidth": <%= @image_preview_width %>,
"PreviewHeight": <%= @image_preview_height %>,
"ProfileWidth": <%= @image_profile_width %>,
"ProfileHeight": <%= @image_profile_height %>,
"InitialFont": "<%= @image_initial_font %>"
"LogSettings": {
"ConsoleEnable": <%= @log_console_enable %>,
"ConsoleLevel": "<%= @log_console_level %>",
"EnableFile": <%= @log_enable_file %>,
"FileLevel": "<%= @log_file_level %>",
"FileFormat": "<%= @log_file_format %>",
"FileLocation": "<%= @log_file_directory %>/mattermost.log"
},
"FileSettings": {
"DriverName": "<%= @file_driver_name %>",
"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 %>",
"AmazonS3Bucket": "<%= @file_amazon_s3_bucket %>",
"AmazonS3Region": "<%= @file_amazon_s3_region %>"
},
"EmailSettings": {
"ByPassEmail" : <%= @email_by_pass_email %>,
"EnableSignUpWithEmail" : <%= @email_enable_sign_up_with_email %>,
"SendEmailNotifications": <%= @email_send_email_notifications %>,
"RequireEmailVerification": <%= @email_require_email_verification %>,
"SMTPUsername": "<%= @email_smtp_username %>",
"SMTPPassword": "<%= @email_smtp_password %>",
"SMTPServer": "<%= @email_smtp_server %>",
"UseTLS": <%= @email_use_tls %>,
"UseStartTLS": <%= @email_use_start_tls %>,
"FeedbackEmail": "<%= @email_feedback_email %>",
"FeedbackName": "<%= @email_feedback_name %>",
"SMTPPort": "<%= @email_smtp_port %>",
"ConnectionSecurity": "<%= @email_connection_security %>",
"InviteSalt": "<%= @email_invite_salt %>",
"PasswordResetSalt": "<%= @email_password_reset_salt %>",
"ApplePushServer": "<%= @email_apple_push_server %>",
"ApplePushCertPublic": "<%= @email_apple_push_cert_public %>",
"ApplePushCertPrivate": "<%= @email_apple_push_cert_private %>"
},
"RateLimitSettings": {
"UseRateLimiter": <%= @ratelimit_use_rate_limiter %>,
"EnableRateLimiter": <%= @ratelimit_enable_rate_limiter %>,
"PerSec": <%= @ratelimit_per_sec %>,
"MemoryStoreSize": <%= @ratelimit_memory_store_size %>,
"VaryByRemoteAddr": <%= @ratelimit_vary_by_remote_addr %>,
@ -65,22 +75,15 @@
},
"PrivacySettings": {
"ShowEmailAddress": <%= @privacy_show_email_address %>,
"ShowPhoneNumber": <%= @privacy_show_phone_number %>,
"ShowSkypeId": <%= @privacy_show_skype_id %>,
"ShowFullName": <%= @privacy_show_full_name %>
},
"TeamSettings": {
"MaxUsersPerTeam": <%= @team_max_users_per_team %>,
"AllowPublicLink": <%= @team_allow_public_link %>,
"AllowValetDefault": <%= @team_allow_valet_default %>,
"TermsLink": "<%= @team_terms_link %>",
"PrivacyLink": "<%= @team_privacy_link %>",
"AboutLink": "<%= @team_about_link %>",
"HelpLink": "<%= @team_help_link %>",
"ReportProblemLink": "<%= @team_report_problem_link %>",
"TourLink": "<%= @team_tour_link %>",
"DefaultThemeColor": "<%= @team_default_color %>",
"DisableTeamCreation": <%= @team_disable_team_creation %>,
"RestrictCreationToDomains": "<%= @team_restrict_creation_to_domains %>"
"GitLabSettings": {
"Enable": <%= @gitlab_enable %>,
"Secret": "<%= @gitlab_secret %>",
"Id": "<%= @gitlab_id %>",
"Scope": "<%= @gitlab_scope %>",
"AuthEndpoint": "<%= @gitlab_auth_endpoint %>",
"TokenEndpoint": "<%= @gitlab_token_endpoint %>",
"UserApiEndpoint": "<%= @gitlab_user_api_endpoint %>"
}
}