headscale (module and package): 0.22.3 -> 0.23.0 (#340054)

- `buildbot` was updated to 4.0, the AngularJS frontend has been replaced by a React frontend, see the [upstream release notes](https://docs.buildbot.net/current/manual/upgrading/4.0-upgrade.html).

- `headscale` has been updated to version 0.23.0 which reworked large parts of the configuration including DNS, Magic DNS prefixes and ACL policy files. See the [upstream changelog](https://github.com/juanfont/headscale/releases/tag/v0.23.0) for details.

- `nginx` package no longer includes `gd` and `geoip` dependencies. For enabling it, override `nginx` package with the optionals `withImageFilter` and `withGeoIP`.

- `systemd.enableUnifiedCgroupHierarchy` option has been removed.

}:

buildGoModule rec {

  pname = "headscale";

  version = "0.22.3";

  version = "0.23.0";

  src = fetchFromGitHub {

    owner = "juanfont";

    repo = "headscale";

    rev = "v${version}";

    hash = "sha256-nqmTqe3F3Oh8rnJH0clwACD/0RpqmfOMXNubr3C8rEc=";

    hash = "sha256-5tlnVNpn+hJayxHjTpbOO3kRInOYOFz0pe9pwjXZlBE=";

  };

  vendorHash = "sha256-IOkbbFtE6+tNKnglE/8ZuNxhPSnloqM2sLgTvagMmnc=";

  patches = [

    # backport of https://github.com/juanfont/headscale/pull/1697

    ./trim-oidc-secret-path.patch

    # fix for headscale not reacting to SIGTERM

    # see https://github.com/juanfont/headscale/pull/1480 and https://github.com/juanfont/headscale/issues/1461

    ./sigterm-fix.patch

  ];

  vendorHash = "sha256-+8dOxPG/Q+wuHgRwwWqdphHOuop0W9dVyClyQuh7aRc=";

  ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"];

  nativeBuildInputs = [installShellFiles];

  checkFlags = ["-short"];

  tags = ["ts2019"];

  postInstall = ''

    installShellCompletion --cmd headscale \

      --bash <($out/bin/headscale completion bash) \

      Headscale implements this coordination server.

    '';

    license = licenses.bsd3;

    mainProgram = "headscale";

    maintainers = with maintainers; [nkje jk kradalby misterio77 ghuntley];

  };

}

diff --git a/hscontrol/app.go b/hscontrol/app.go

index b8dceba..4bcf019 100644

--- a/hscontrol/app.go

+++ b/hscontrol/app.go

@@ -821,6 +821,7 @@ func (h *Headscale) Serve() error {

 				// And we're done:

 				cancel()

+ 				return

 			}

 		}

 	}

diff --git a/hscontrol/config.go b/hscontrol/config.go

index 0e83a1c..71fbfb0 100644

--- a/hscontrol/config.go

+++ b/hscontrol/config.go

@@ -573,7 +573,7 @@ func GetHeadscaleConfig() (*Config, error) {

 		if err != nil {

 			return nil, err

 		}

-		oidcClientSecret = string(secretBytes)

+		oidcClientSecret = strings.TrimSpace(string(secretBytes))

 	}

 	return &Config{