|
@@ -166,6 +166,7 @@ var (
|
|
|
// LDAP
|
|
// LDAP
|
|
|
LdapEnabled bool
|
|
LdapEnabled bool
|
|
|
LdapConfigFile string
|
|
LdapConfigFile string
|
|
|
|
|
+ LdapSyncCron string
|
|
|
LdapAllowSignup = true
|
|
LdapAllowSignup = true
|
|
|
|
|
|
|
|
// QUOTA
|
|
// QUOTA
|
|
@@ -877,14 +878,6 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
|
|
|
return err
|
|
return err
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- ldapSec := iniFile.Section("auth.ldap")
|
|
|
|
|
- LdapEnabled = ldapSec.Key("enabled").MustBool(false)
|
|
|
|
|
- LdapConfigFile, err = valueAsString(ldapSec, "config_file", "")
|
|
|
|
|
- if err != nil {
|
|
|
|
|
- return err
|
|
|
|
|
- }
|
|
|
|
|
- LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
|
|
|
|
|
-
|
|
|
|
|
alerting := iniFile.Section("alerting")
|
|
alerting := iniFile.Section("alerting")
|
|
|
AlertingEnabled = alerting.Key("enabled").MustBool(true)
|
|
AlertingEnabled = alerting.Key("enabled").MustBool(true)
|
|
|
ExecuteAlerts = alerting.Key("execute_alerts").MustBool(true)
|
|
ExecuteAlerts = alerting.Key("execute_alerts").MustBool(true)
|
|
@@ -917,6 +910,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
|
|
|
cfg.PluginsEnableAlpha = true
|
|
cfg.PluginsEnableAlpha = true
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ cfg.readLDAPConfig()
|
|
|
cfg.readSessionConfig()
|
|
cfg.readSessionConfig()
|
|
|
cfg.readSmtpSettings()
|
|
cfg.readSmtpSettings()
|
|
|
cfg.readQuotaSettings()
|
|
cfg.readQuotaSettings()
|
|
@@ -981,6 +975,14 @@ type RemoteCacheOptions struct {
|
|
|
ConnStr string
|
|
ConnStr string
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+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()
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
func (cfg *Cfg) readSessionConfig() {
|
|
func (cfg *Cfg) readSessionConfig() {
|
|
|
sec, _ := cfg.Raw.GetSection("session")
|
|
sec, _ := cfg.Raw.GetSection("session")
|
|
|
|
|
|