From 0878f2e7babf964dc79c18578898f896b0ba3482 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 12 Feb 2018 16:08:41 +0100
Subject: [PATCH] ansible-inventories/paragon#2061 Prepare for GitLab 11.0
---
templates/gitlab.rb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/templates/gitlab.rb b/templates/gitlab.rb
index 672fc41..e5f49a4 100644
--- a/templates/gitlab.rb
+++ b/templates/gitlab.rb
@@ -608,8 +608,6 @@ mattermost['gitlab_enable'] = true
# mattermost['gitlab_token_endpoint'] = "http://gitlab.example.com/oauth/token"
# mattermost['gitlab_user_api_endpoint'] = "http://gitlab.example.com/api/v3/user"
mattermost['env'] = {
- 'MM_DB2SETTINGS_BACKUPCREATED' => 'true',
- 'MM_DB2SETTINGS_TEAMNAME' => 'paragon',
'MM_SERVICESETTINGS_ENABLEINCOMINGWEBHOOKS' => 'true',
'MM_SERVICESETTINGS_ENABLEPOSTUSERNAMEOVERRIDE' => 'true',
'MM_SERVICESETTINGS_ENABLEPOSTICONOVERRIDE' => 'true',
@@ -624,6 +622,7 @@ mattermost['env'] = {
'MM_EMAILSETTINGS_ENABLESIGNUPWITHEMAIL' => 'true',
'MM_EMAILSETTINGS_ENABLESIGNINWITHEMAIL' => 'true',
'MM_EMAILSETTINGS_ENABLESIGNINWITHUSERNAME' => 'true',
+ 'MM_EMAILSETTINGS_ENABLESMTPAUTH' => 'true',
'MM_EMAILSETTINGS_SENDEMAILNOTIFICATIONS' => 'true',
'MM_EMAILSETTINGS_REQUIREEMAILVERIFICATION' => 'false',
'MM_EMAILSETTINGS_SMTPUSERNAME' => "{{ gitlab_rails.smtp.user_name }}",
--
GitLab