@@ -30,12 +30,18 @@ func Server(cfg *config.Config) *cli.Command {
|
||||
if cfg.HTTP.Root != "/" {
|
||||
cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
|
||||
}
|
||||
cfg.Backend.Servers = ctx.StringSlice("backend-server")
|
||||
cfg.Fallback.Servers = ctx.StringSlice("fallback-server")
|
||||
// StringSliceFlag doesn't support Destination
|
||||
// UPDATE Destination on string flags supported. Wait for https://github.com/urfave/cli/pull/1078 to get to micro/cli
|
||||
if len(ctx.StringSlice("backend-server")) > 0 {
|
||||
cfg.Backend.Servers = ctx.StringSlice("backend-server")
|
||||
}
|
||||
if len(ctx.StringSlice("fallback-server")) > 0 {
|
||||
cfg.Fallback.Servers = ctx.StringSlice("fallback-server")
|
||||
}
|
||||
if !cfg.Supervised {
|
||||
return ParseConfig(ctx, cfg)
|
||||
}
|
||||
logger.Debug().Str("service", "glauth").Msg("ignoring config file parsing when running supervised")
|
||||
logger.Debug().Strs("backend-server", ctx.StringSlice("backend-server")).Str("service", "glauth").Msg("ignoring config file parsing when running supervised")
|
||||
return nil
|
||||
},
|
||||
Action: func(c *cli.Context) error {
|
||||
@@ -62,11 +68,11 @@ func Server(cfg *config.Config) *cli.Command {
|
||||
|
||||
lcfg := glauthcfg.LDAP{
|
||||
Enabled: cfg.Ldap.Enabled,
|
||||
Listen: cfg.Ldap.Address,
|
||||
Listen: cfg.Ldap.Addr,
|
||||
}
|
||||
lscfg := glauthcfg.LDAPS{
|
||||
Enabled: cfg.Ldaps.Enabled,
|
||||
Listen: cfg.Ldaps.Address,
|
||||
Listen: cfg.Ldaps.Addr,
|
||||
Cert: cfg.Ldaps.Cert,
|
||||
Key: cfg.Ldaps.Key,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user