From ff0a7905166e29ecf9404fa90d23af7863885384 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 27 Jul 2017 08:48:02 +0100 Subject: PLT-7040: Fix capitalisation of Elasticsearch in Config. (#7020) --- app/elasticsearch.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/elasticsearch.go') diff --git a/app/elasticsearch.go b/app/elasticsearch.go index 857ed570a..740042ba5 100644 --- a/app/elasticsearch.go +++ b/app/elasticsearch.go @@ -12,9 +12,9 @@ import ( ) func TestElasticsearch(cfg *model.Config) *model.AppError { - if *cfg.ElasticSearchSettings.Password == model.FAKE_SETTING { - if *cfg.ElasticSearchSettings.ConnectionUrl == *utils.Cfg.ElasticSearchSettings.ConnectionUrl && *cfg.ElasticSearchSettings.Username == *utils.Cfg.ElasticSearchSettings.Username { - *cfg.ElasticSearchSettings.Password = *utils.Cfg.ElasticSearchSettings.Password + if *cfg.ElasticsearchSettings.Password == model.FAKE_SETTING { + if *cfg.ElasticsearchSettings.ConnectionUrl == *utils.Cfg.ElasticsearchSettings.ConnectionUrl && *cfg.ElasticsearchSettings.Username == *utils.Cfg.ElasticsearchSettings.Username { + *cfg.ElasticsearchSettings.Password = *utils.Cfg.ElasticsearchSettings.Password } else { return model.NewAppError("TestElasticsearch", "ent.elasticsearch.test_config.reenter_password", nil, "", http.StatusBadRequest) } -- cgit v1.2.3-1-g7c22