summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go15
1 files changed, 15 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index 58bc339e1..234acae11 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -492,6 +492,11 @@ func getClientConfig(c *model.Config) map[string]string {
props["PasswordRequireNumber"] = strconv.FormatBool(*c.PasswordSettings.Number)
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)
+ }
}
return props
@@ -560,6 +565,16 @@ 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
+ }
+
for i := range cfg.SqlSettings.DataSourceReplicas {
cfg.SqlSettings.DataSourceReplicas[i] = Cfg.SqlSettings.DataSourceReplicas[i]
}