Merge branch 'main' into main

This commit is contained in:
Kristoffer Dalby 2021-09-26 21:35:26 +01:00 committed by GitHub
commit cc054d71fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 331 additions and 88 deletions

3
app.go
View file

@ -174,6 +174,9 @@ func (h *Headscale) Serve() error {
r.POST("/machine/:id", h.RegistrationHandler)
r.GET("/oidc/register/:mKey", h.RegisterOIDC)
r.GET("/oidc/callback", h.OIDCCallback)
r.GET("/apple", h.AppleMobileConfig)
r.GET("/apple/:platform", h.ApplePlatformConfig)
var err error
timeout := 30 * time.Second