diff --git a/cmd/cloudflared/macos_service.go b/cmd/cloudflared/macos_service.go index 507412f7..4fa083f0 100644 --- a/cmd/cloudflared/macos_service.go +++ b/cmd/cloudflared/macos_service.go @@ -132,7 +132,7 @@ func installLaunchd(c *cli.Context) error { log.Err(err).Msg("Error determining install path") return errors.Wrap(err, "Error determining install path") } - extraArgs, err := getServiceExtraArgsFromCliArgs(c, log) + extraArgs, extraEnv, err := getServiceExtraArgsFromCliArgs(c, log) if err != nil { errMsg := "Unable to determine extra arguments for launch daemon" log.Err(err).Msg(errMsg) @@ -150,7 +150,7 @@ func installLaunchd(c *cli.Context) error { return errors.Wrap(err, "error determining stderr path") } launchdTemplate := newLaunchdTemplate(installPath, stdoutPath, stderrPath) - templateArgs := ServiceTemplateArgs{Path: etPath, ExtraArgs: extraArgs} + templateArgs := ServiceTemplateArgs{Path: etPath, ExtraArgs: extraArgs, Env: extraEnv} err = launchdTemplate.Generate(&templateArgs) if err != nil { log.Err(err).Msg("error generating launchd template") diff --git a/cmd/cloudflared/windows_service.go b/cmd/cloudflared/windows_service.go index 79b7f431..a1a74d03 100644 --- a/cmd/cloudflared/windows_service.go +++ b/cmd/cloudflared/windows_service.go @@ -193,12 +193,13 @@ func installWindowsService(c *cli.Context) error { s.Close() return fmt.Errorf(serviceAlreadyExistsWarn(windowsServiceName)) } - extraArgs, err := getServiceExtraArgsFromCliArgs(c, &log) + extraArgs, extraEnv, err := getServiceExtraArgsFromCliArgs(c, &log) if err != nil { errMsg := "Unable to determine extra arguments for windows service" log.Err(err).Msg(errMsg) return errors.Wrap(err, errMsg) } + _ = extraEnv // No use for this on Windows config := mgr.Config{StartType: mgr.StartAutomatic, DisplayName: windowsServiceDescription} s, err = m.CreateService(windowsServiceName, exepath, config, extraArgs...)