From 7cc516a0be4c61282e4c44f6953db1d4f885b939 Mon Sep 17 00:00:00 2001 From: soraefir Date: Thu, 21 May 2026 02:28:42 +0200 Subject: [PATCH] fix auth midleware --- modules/server/containers/apps/handbrake.nix | 6 +++++- modules/server/containers/apps/servarr.nix | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/server/containers/apps/handbrake.nix b/modules/server/containers/apps/handbrake.nix index 377b057..d918e42 100644 --- a/modules/server/containers/apps/handbrake.nix +++ b/modules/server/containers/apps/handbrake.nix @@ -2,6 +2,10 @@ let serverCfg = config.syscfg.server; version = "latest"; + + routerName = if containerCfg.subpath != null + then "${containerCfg.subdomain}-${lib.strings.sanitizeDerivationName containerCfg.subpath}" + else containerCfg.subdomain; in { paths = [{ @@ -27,7 +31,7 @@ in { AUTOMATED_CONVERSION_OUTPUT_SUBDIR = "SAME_AS_SRC"; }; extraLabels = { } // (if serverCfg.containers ? authentik then { - "traefik.http.routers.${containerCfg.subdomain}.middlewares" = "authentik"; + "traefik.http.routers.${routerName}.middlewares" = "authentik"; } else {}); extraOptions = [ "--tmpfs=/tmp:rw,noexec,nosuid,size=512m" diff --git a/modules/server/containers/apps/servarr.nix b/modules/server/containers/apps/servarr.nix index 42e7ff6..7bef2ae 100644 --- a/modules/server/containers/apps/servarr.nix +++ b/modules/server/containers/apps/servarr.nix @@ -60,6 +60,9 @@ in "--tmpfs=/tmp:rw,noexec,nosuid,size=512m" "--passwd-entry=root:x:0:0:root:/root:/bin/sh" ]; + extraLabels = { } // (if serverCfg.containers ? authentik then { + "traefik.http.routers.${containerCfg.subdomain}-prowlarr.middlewares" = "authentik"; + } else {}); overrides.volumes = sharedVolumes ++ [ "${serverCfg.configPath}/servarr/prowlarr:/config" ]; }; @@ -82,6 +85,9 @@ in "--tmpfs=/tmp:rw,noexec,nosuid,size=512m" "--passwd-entry=root:x:0:0:root:/root:/bin/sh" ]; + extraLabels = { } // (if serverCfg.containers ? authentik then { + "traefik.http.routers.${containerCfg.subdomain}-radarr.middlewares" = "authentik"; + } else {}); overrides.volumes = sharedVolumes ++ [ "${serverCfg.configPath}/servarr/radarr:/config" ]; }; @@ -104,6 +110,9 @@ in "--tmpfs=/tmp:rw,noexec,nosuid,size=512m" "--passwd-entry=root:x:0:0:root:/root:/bin/sh" ]; + extraLabels = { } // (if serverCfg.containers ? authentik then { + "traefik.http.routers.${containerCfg.subdomain}-sonarr.middlewares" = "authentik"; + } else {}); overrides.volumes = sharedVolumes ++ [ "${serverCfg.configPath}/servarr/sonarr:/config" ]; }; @@ -126,6 +135,9 @@ in "--tmpfs=/tmp:rw,noexec,nosuid,size=512m" "--passwd-entry=root:x:0:0:root:/root:/bin/sh" ]; + extraLabels = { } // (if serverCfg.containers ? authentik then { + "traefik.http.routers.${containerCfg.subdomain}-lidarr.middlewares" = "authentik"; + } else {}); overrides.volumes = sharedVolumes ++ [ "${serverCfg.configPath}/servarr/lidarr:/config" ]; };