diff --git a/app.go b/app.go index 763fdfe8..4c1d2015 100644 --- a/app.go +++ b/app.go @@ -456,7 +456,7 @@ func (h *Headscale) createRouter(grpcMux *runtime.ServeMux) *gin.Engine { router.POST("/machine/:id", h.RegistrationHandler) router.GET("/oidc/register/:mkey", h.RegisterOIDC) router.GET("/oidc/callback", h.OIDCCallback) - router.GET("/apple", h.AppleMobileConfig) + router.GET("/apple", h.AppleConfigMessage) router.GET("/apple/:platform", h.ApplePlatformConfig) router.GET("/swagger", SwaggerUI) router.GET("/swagger/v1/openapiv2.json", SwaggerAPIv1) diff --git a/apple_mobileconfig.go b/apple_mobileconfig.go index 69f61a63..137276d4 100644 --- a/apple_mobileconfig.go +++ b/apple_mobileconfig.go @@ -11,26 +11,27 @@ import ( "github.com/rs/zerolog/log" ) -// AppleMobileConfig shows a simple message in the browser to point to the CLI -// Listens in /register. -func (h *Headscale) AppleMobileConfig(ctx *gin.Context) { +// AppleConfigMessage shows a simple message in the browser to point the user +// to the iOS/MacOS profile and instructions for how to install it +func (h *Headscale) AppleConfigMessage(ctx *gin.Context) { appleTemplate := template.Must(template.New("apple").Parse(`
-This page provides configuration profiles for the official Tailscale clients for iOS and macOS.
- The profiles will configure Tailscale.app to use {{.Url}} as its control server.
+ The profiles will configure Tailscale.app to use {{.URL}}
as its control server.
You should always inspect the profile before installing it:
+You should always download and inspect the profile before installing it:
-curl {{.Url}}/apple/macos
curl {{.URL}}/apple/macos