From a1f17c1f8482f3c38e17cabe2365c76a1a2f32d4 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 13 Jul 2017 21:00:59 +0100 Subject: PLT-6474 Basic Elasticsearch System Console Page (#6825) * PLT-6474: Basic System Console Elasticsearch Config. * Fix review comments. * More review fixes. * Review comments. --- utils/config.go | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'utils') diff --git a/utils/config.go b/utils/config.go index f8ceccc2c..478e3ba99 100644 --- a/utils/config.go +++ b/utils/config.go @@ -536,11 +536,6 @@ func getClientConfig(c *model.Config) map[string]string { props["PasswordRequireSymbol"] = strconv.FormatBool(*c.PasswordSettings.Symbol) } - if *License.Features.Elasticsearch { - props["ElasticSearchEnableIndexing"] = strconv.FormatBool(*c.ElasticSearchSettings.EnableIndexing) - props["ElasticSearchEnableSearching"] = strconv.FormatBool(*c.ElasticSearchSettings.EnableSearching) - } - if *License.Features.Announcement { props["EnableBanner"] = strconv.FormatBool(*c.AnnouncementSettings.EnableBanner) props["BannerText"] = *c.AnnouncementSettings.BannerText @@ -616,12 +611,6 @@ func Desanitize(cfg *model.Config) { cfg.SqlSettings.AtRestEncryptKey = Cfg.SqlSettings.AtRestEncryptKey } - if *cfg.ElasticSearchSettings.ConnectionUrl == model.FAKE_SETTING { - *cfg.ElasticSearchSettings.ConnectionUrl = *Cfg.ElasticSearchSettings.ConnectionUrl - } - if *cfg.ElasticSearchSettings.Username == model.FAKE_SETTING { - *cfg.ElasticSearchSettings.Username = *Cfg.ElasticSearchSettings.Username - } if *cfg.ElasticSearchSettings.Password == model.FAKE_SETTING { *cfg.ElasticSearchSettings.Password = *Cfg.ElasticSearchSettings.Password } -- cgit v1.2.3-1-g7c22