IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature: introduce LdapActiveSyncEnabled setting (#16787)

Browse Source 
* 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
This commit is contained in:
Oleg Gaidarenko
2019-04-27 09:03:59 +03:00
committed by GitHub
parent 060e97bea8
commit 66c9297c36
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conf/defaults.ini
View File

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

8
pkg/setting/setting.go
View File

@@ -167,7 +167,8 @@ var (
LdapEnabled bool LdapEnabled bool
LdapConfigFile string LdapConfigFile string
LdapSyncCron string LdapSyncCron string
LdapAllowSignup = true LdapAllowSignup bool
LdapActiveSyncEnabled bool
// QUOTA // QUOTA
Quota QuotaSettings Quota QuotaSettings
@@ -971,10 +972,11 @@ type RemoteCacheOptions struct {
func (cfg *Cfg) readLDAPConfig() { func (cfg *Cfg) readLDAPConfig() {
ldapSec := cfg.Raw.Section("auth.ldap") ldapSec := cfg.Raw.Section("auth.ldap")
LdapEnabled = ldapSec.Key("enabled").MustBool(false)
LdapConfigFile = ldapSec.Key("config_file").String() LdapConfigFile = ldapSec.Key("config_file").String()
LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
LdapSyncCron = ldapSec.Key("sync_cron").String() 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() { func (cfg *Cfg) readSessionConfig() {