From 33eeb84d68503e7669f44881a03738a0a30c3c9d Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 25 Dec 2024 21:27:40 +0100 Subject: fix(modules/back): Remove the `gitPath` from the service name With it, the service names become nearly illegible. --- modules/by-name/ba/back/module.nix | 2 +- tests/by-name/ba/back/test.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/by-name/ba/back/module.nix b/modules/by-name/ba/back/module.nix index f732f02..2bc5159 100644 --- a/modules/by-name/ba/back/module.nix +++ b/modules/by-name/ba/back/module.nix @@ -63,7 +63,7 @@ services = lib.mapAttrs' (gitPath: config: { - name = builtins.replaceStrings ["/"] ["_"] "back-${gitPath}-${config.domain}"; + name = builtins.replaceStrings ["/"] ["_"] "back-${config.domain}"; value = mkUnit gitPath config.port; }) cfg.repositories; diff --git a/tests/by-name/ba/back/test.nix b/tests/by-name/ba/back/test.nix index 220d100..63f2837 100644 --- a/tests/by-name/ba/back/test.nix +++ b/tests/by-name/ba/back/test.nix @@ -104,7 +104,7 @@ in ''}") with subtest("back server starts"): - server.wait_for_unit("${builtins.replaceStrings ["/"] ["_"] "back-${gitRepoPath}-${domain}.service"}") + server.wait_for_unit("${builtins.replaceStrings ["/"] ["_"] "back-${domain}.service"}") with subtest("client can access the server"): client.succeed("${pkgs.writeShellScript "curl-back" '' -- cgit 1.4.1