Merge branch 'main' into fix-https-listen
This commit is contained in:
commit
ed58b2e4e2
8 changed files with 23 additions and 11 deletions
4
app.go
4
app.go
|
@ -194,8 +194,10 @@ func NewHeadscale(cfg *Config) (*Headscale, error) {
|
|||
|
||||
if cfg.OIDC.Issuer != "" {
|
||||
err = app.initOIDC()
|
||||
if err != nil {
|
||||
if err != nil && cfg.OIDC.OnlyStartIfOIDCIsAvailable {
|
||||
return nil, err
|
||||
} else {
|
||||
log.Warn().Err(err).Msg("failed to set up OIDC provider, falling back to CLI based authentication")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue