Commit 66c9297c by Oleg Gaidarenko Committed by GitHub

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
parent 060e97be
......@@ -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]
......
......@@ -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() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment