diff --git a/system/features/web-containers.nix b/system/features/web-containers.nix index 3511c98..d64b4d6 100644 --- a/system/features/web-containers.nix +++ b/system/features/web-containers.nix @@ -79,7 +79,7 @@ }: let fqn = "${hostname}.${domain}"; - serviceName = lib.strings.replaceChars [ "." ] [ "-" ] fqn; + serviceName = builtins.replaceStrings [ "." ] [ "-" ] fqn; routerRule = if public then hostRule hostname domain else localHostRule hostname domain; homepageLabels = if homepageOpts == { } then @@ -109,17 +109,16 @@ extraOptions ; autoStart = true; - labels = - { - "traefik.enable" = "true"; - "traefik.http.routers.${serviceName}.rule" = "${routerRule}"; - "traefik.http.routers.${serviceName}.service" = "${serviceName}"; - "traefik.http.routers.${serviceName}.entrypoints" = "web,websecure"; - "traefik.http.services.${serviceName}.loadbalancer.server.port" = "${toString port}"; - } - // oauthLabels - // homepageLabels - // extraLabels; + labels = { + "traefik.enable" = "true"; + "traefik.http.routers.${serviceName}.rule" = "${routerRule}"; + "traefik.http.routers.${serviceName}.service" = "${serviceName}"; + "traefik.http.routers.${serviceName}.entrypoints" = "web,websecure"; + "traefik.http.services.${serviceName}.loadbalancer.server.port" = "${toString port}"; + } + // oauthLabels + // homepageLabels + // extraLabels; }; in builtins.mapAttrs mkContainer config.virtualisation.web-containers.containers