Merge pull request #837 from ShadowJonathan/patch-1

This commit is contained in:
Kristoffer Dalby 2022-09-30 10:22:38 +02:00 committed by GitHub
commit 98f5b7f638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

10
app.go
View File

@ -194,10 +194,12 @@ func NewHeadscale(cfg *Config) (*Headscale, error) {
if cfg.OIDC.Issuer != "" { if cfg.OIDC.Issuer != "" {
err = app.initOIDC() err = app.initOIDC()
if err != nil && cfg.OIDC.OnlyStartIfOIDCIsAvailable { if err != nil {
return nil, err if cfg.OIDC.OnlyStartIfOIDCIsAvailable {
} else { return nil, err
log.Warn().Err(err).Msg("failed to set up OIDC provider, falling back to CLI based authentication") } else {
log.Warn().Err(err).Msg("failed to set up OIDC provider, falling back to CLI based authentication")
}
} }
} }