devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-30 02:43:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #837 from ShadowJonathan/patch-1

Browse source
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
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app.go
View file

@ -194,12 +194,14 @@ 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 {
if cfg.OIDC.OnlyStartIfOIDCIsAvailable {
return nil, err return nil, err
} else { } else {
log.Warn().Err(err).Msg("failed to set up OIDC provider, falling back to CLI based authentication") log.Warn().Err(err).Msg("failed to set up OIDC provider, falling back to CLI based authentication")
} }
} }
}
if app.cfg.DNSConfig != nil && app.cfg.DNSConfig.Proxied { // if MagicDNS if app.cfg.DNSConfig != nil && app.cfg.DNSConfig.Proxied { // if MagicDNS
magicDNSDomains := generateMagicDNSRootDomains(app.cfg.IPPrefixes) magicDNSDomains := generateMagicDNSRootDomains(app.cfg.IPPrefixes)