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

Update mattermost to v2.0.0

This commit is contained in:
Marin Jankovski 2016-02-17 09:55:30 +01:00
parent 659e4ab0e6
commit 8caacf73e2
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/software/mattermost.rb
View File

@ -17,16 +17,17 @@
#
name "mattermost"
default_version "v1.4.0"
default_version "v2.0.0"
source url: "https://github.com/mattermost/platform/releases/download/#{version}/mattermost.tar.gz",
md5: '7e5b144c1dc221e07c92f642b4c6f44f'
md5: '718ec216d0635a361b632699fc92a517'
build do
move "bin/platform", "#{install_dir}/embedded/bin/mattermost"
command "mkdir -p #{install_dir}/embedded/service/mattermost"
command "#{install_dir}/embedded/bin/rsync -a --delete ./api/templates #{install_dir}/embedded/service/mattermost/api/"
command "#{install_dir}/embedded/bin/rsync -a --delete ./i18n #{install_dir}/embedded/service/mattermost/"
command "#{install_dir}/embedded/bin/rsync -a --delete ./web/static #{install_dir}/embedded/service/mattermost/web/"
command "#{install_dir}/embedded/bin/rsync -a --delete ./web/templates #{install_dir}/embedded/service/mattermost/web/"

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

@ -580,7 +580,10 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['service_enable_post_icon_override'] = false
# mattermost['service_enable_testing'] = false
# mattermost['service_enable_security_fix_alert'] = true
# mattermost['service_enable_insecure_outgoing_connections'] = false
# mattermost['service_enable_outgoing_webhooks'] = true
# mattermost['service_enable_commands'] = false
# mattermost['service_enable_only_admin_integrations'] = true
# mattermost['service_enable_oauth_service_provider'] = false
# mattermost['service_enable_developer'] = false
# mattermost['service_session_length_web_in_days'] = 30
@ -625,6 +628,8 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['aws'] = {'S3AccessKeyId' => '123', 'S3SecretAccessKey' => '123', 'S3Bucket' => 'aa', 'S3Region' => 'bb'}
# mattermost['email_enable_sign_up_with_email'] = true
# mattermost['email_enable_sign_in_with_email'] = true
# mattermost['email_enable_sign_in_with_username'] = false
# mattermost['email_send_email_notifications'] = false
# mattermost['email_require_email_verification'] = false
# mattermost['email_smtp_username'] = nil

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

@ -626,7 +626,10 @@ 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']['service_enable_insecure_outgoing_connections'] = false
default['gitlab']['mattermost']['service_enable_outgoing_webhooks'] = false
default['gitlab']['mattermost']['service_enable_commands'] = false
default['gitlab']['mattermost']['service_enable_only_admin_integrations'] = true
default['gitlab']['mattermost']['service_enable_oauth_service_provider'] = false
default['gitlab']['mattermost']['service_enable_developer'] = false
default['gitlab']['mattermost']['service_session_length_web_in_days'] = 30
@ -665,6 +668,8 @@ default['gitlab']['mattermost']["file_amazon_s3_location_constraint"] = false
default['gitlab']['mattermost']["file_amazon_s3_lowercase_bucket"] = false
default['gitlab']['mattermost']['email_enable_sign_up_with_email'] = false
default['gitlab']['mattermost']['email_enable_sign_in_with_email'] = true
default['gitlab']['mattermost']['email_enable_sign_in_with_username'] = false
default['gitlab']['mattermost']['email_send_email_notifications'] = false
default['gitlab']['mattermost']['email_require_email_verification'] = false
default['gitlab']['mattermost']['email_smtp_username'] = nil

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

@ -7,10 +7,13 @@
"EnableOAuthServiceProvider": <%= @service_enable_oauth_service_provider %>,
"EnableIncomingWebhooks": <%= @service_enable_incoming_webhooks %>,
"EnableOutgoingWebhooks": <%= @service_enable_outgoing_webhooks %>,
"EnableCommands": <%= @service_enable_commands %>,
"EnableOnlyAdminIntegrations": <%= @service_enable_only_admin_integrations %>,
"EnablePostUsernameOverride": <%= @service_enable_post_username_override %>,
"EnablePostIconOverride": <%= @service_enable_post_icon_override %>,
"EnableTesting": <%= @service_enable_testing %>,
"EnableSecurityFixAlert": <%= @service_enable_security_fix_alert %>,
"EnableInsecureOutgoingConnections": <%= @service_enable_insecure_outgoing_connections %>,
"EnableDeveloper": <%= @service_enable_developer %>,
"SessionLengthWebInDays" : <%= @service_session_length_web_in_days %>,
"SessionLengthMobileInDays" : <%= @service_session_length_mobile_in_days %>,
@ -66,6 +69,8 @@
},
"EmailSettings": {
"EnableSignUpWithEmail" : <%= @email_enable_sign_up_with_email %>,
"EnableSignInWithEmail": <%= @email_enable_sign_in_with_email %>,
"EnableSignInWithUsername": <%= @email_enable_sign_in_with_username %>,
"SendEmailNotifications": <%= @email_send_email_notifications %>,
"RequireEmailVerification": <%= @email_require_email_verification %>,
"SMTPUsername": "<%= @email_smtp_username %>",