diff options
| author | George Goldberg <george@gberg.me> | 2017-07-13 21:00:59 +0100 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-07-13 13:00:59 -0700 |
| commit | a1f17c1f8482f3c38e17cabe2365c76a1a2f32d4 (patch) | |
| tree | 8681a3840d9881dad385628f74310e1576a188c4 /utils | |
| parent | 4eed88e0c2eebbaf04489526dfaeab7cfb77ee98 (diff) | |
| download | chat-a1f17c1f8482f3c38e17cabe2365c76a1a2f32d4.tar.gz chat-a1f17c1f8482f3c38e17cabe2365c76a1a2f32d4.tar.bz2 chat-a1f17c1f8482f3c38e17cabe2365c76a1a2f32d4.zip | |
PLT-6474 Basic Elasticsearch System Console Page (#6825)
* PLT-6474: Basic System Console Elasticsearch Config.
* Fix review comments.
* More review fixes.
* Review comments.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 11 |
1 files changed, 0 insertions, 11 deletions
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 } |