浏览代码

Feature: introduce LdapActiveSyncEnabled setting (#16787)

* Feature: introduce LdapActiveSyncEnabled setting

We probably remove it after the active sync is done.
But at the moment we do not want to affect the current users
with not fully tested feature

* Chore: move settings in more logical order
Oleg Gaidarenko 6 年之前
父节点
当前提交
66c9297c36
共有 2 个文件被更改,包括 9 次插入7 次删除
  1. 1 1
      conf/defaults.ini
  2. 8 6
      pkg/setting/setting.go

+ 1 - 1
conf/defaults.ini

@@ -362,10 +362,10 @@ headers =
 enabled = false
 config_file = /etc/grafana/ldap.toml
 allow_sign_up = true
-sync_cron = @hourly
 
 # LDAP backround sync (Enterprise only)
 sync_cron = @hourly
+active_sync_enabled = false
 
 #################################### SMTP / Emailing #####################
 [smtp]

+ 8 - 6
pkg/setting/setting.go

@@ -164,10 +164,11 @@ var (
 	GoogleTagManagerId string
 
 	// LDAP
-	LdapEnabled     bool
-	LdapConfigFile  string
-	LdapSyncCron    string
-	LdapAllowSignup = true
+	LdapEnabled           bool
+	LdapConfigFile        string
+	LdapSyncCron          string
+	LdapAllowSignup       bool
+	LdapActiveSyncEnabled bool
 
 	// QUOTA
 	Quota QuotaSettings
@@ -971,10 +972,11 @@ type RemoteCacheOptions struct {
 
 func (cfg *Cfg) readLDAPConfig() {
 	ldapSec := cfg.Raw.Section("auth.ldap")
-	LdapEnabled = ldapSec.Key("enabled").MustBool(false)
 	LdapConfigFile = ldapSec.Key("config_file").String()
-	LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
 	LdapSyncCron = ldapSec.Key("sync_cron").String()
+	LdapEnabled = ldapSec.Key("enabled").MustBool(false)
+	LdapActiveSyncEnabled = ldapSec.Key("active_sync_enabled").MustBool(false)
+	LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
 }
 
 func (cfg *Cfg) readSessionConfig() {