IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-16244] Add Elasticsearch SkipTLSVerification parameter to the config (#11189)

Browse Source 
* [MM-16244] Add Elasticsearch SkipTLSVerification parameter to the config

* Add SkipTLSVerification config parameter to the diagnostics

* Update diagnostics key for consistency

Co-Authored-By: George Goldberg <george@gberg.me>
This commit is contained in:
Miguel de la Cruz
2019-06-23 12:03:55 +01:00
committed by GitHub
parent efb9e2fe54
commit 162a2a9903
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
model/config.go
View File

@@ -2033,6 +2033,7 @@ type ElasticsearchSettings struct {
LiveIndexingBatchSize *int `restricted:"true"`
BulkIndexingTimeWindowSeconds *int `restricted:"true"`
RequestTimeoutSeconds *int `restricted:"true"`
SkipTLSVerification *bool `restricted:"true"`
Trace *string `restricted:"true"`
}
@@ -2113,6 +2114,10 @@ func (s *ElasticsearchSettings) SetDefaults() {
s.RequestTimeoutSeconds = NewInt(ELASTICSEARCH_SETTINGS_DEFAULT_REQUEST_TIMEOUT_SECONDS)
}
if s.SkipTLSVerification == nil {
s.SkipTLSVerification = NewBool(false)
}
if s.Trace == nil {
s.Trace = NewString("")
}