From 868ba53208bbc2ab4ed3058130320a4d65c9dc13 Mon Sep 17 00:00:00 2001
From: soraefir <soraefir+git@helcel>
Date: Wed, 13 May 2026 22:00:34 +0200
Subject: [PATCH] move traefik rule

---
 modules/server/containers/apps/traefik.nix | 8 +++++++-
 modules/server/containers/apps/umami.nix   | 7 +------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/server/containers/apps/traefik.nix b/modules/server/containers/apps/traefik.nix
index 5faac52..83503da 100644
--- a/modules/server/containers/apps/traefik.nix
+++ b/modules/server/containers/apps/traefik.nix
@@ -29,11 +29,17 @@ in {
         "traefik.http.routers.${containerCfg.subdomain}.service" = "api@internal";
                 
         "traefik.http.routers.${containerCfg.subdomain}.middlewares" =  if serverCfg.containers?authentik then "authentik" else "";
+      } // (if serverCfg.containers?authentik then {
         "traefik.http.middlewares.authentik.forwardauth.maxResponseBodySize" = "10485760";
         "traefik.http.middlewares.authentik.forwardauth.address" = "http://authentik-server:9000/outpost.goauthentik.io/auth/traefik";
         "traefik.http.middlewares.authentik.forwardauth.trustForwardHeader" = "true";
         "traefik.http.middlewares.authentik.forwardauth.authResponseHeaders" = "X-authentik-username,X-authentik-groups,X-authentik-email,X-authentik-name,X-authentik-uid,X-authentik-jwt,X-authentik-meta-jwks,X-authentik-meta-outpost,X-authentik-meta-provider,X-authentik-meta-app,X-authentik-meta-version";
-      } // (if containerCfg.extra ? provider || serverCfg.hostDomain != "localhost" then {
+      } else {}) // (if serverCfg.containers?umami then {
+        "traefik.http.middlewares.umami-global.plugin.umami-feeder.umamiHost" = "http://umami-server:3000";
+        "traefik.http.middlewares.umami-global.plugin.umami-feeder.umamiUsername" = "admin";
+        "traefik.http.middlewares.umami-global.plugin.umami-feeder.umamiPassword" = "umami";
+        "traefik.http.middlewares.umami-global.plugin.umami-feeder.createNewWebsites" = "true";
+      } else {}) // (if containerCfg.extra ? provider || serverCfg.hostDomain != "localhost" then {
         "traefik.http.routers.${containerCfg.subdomain}.tls.certresolver" = "default";
         "traefik.http.routers.${containerCfg.subdomain}.tls.domains[0].main" = "${serverCfg.hostDomain}";
         "traefik.http.routers.${containerCfg.subdomain}.tls.domains[0].sans" = "*.${serverCfg.hostDomain}";
diff --git a/modules/server/containers/apps/umami.nix b/modules/server/containers/apps/umami.nix
index 633a37e..36c0da6 100644
--- a/modules/server/containers/apps/umami.nix
+++ b/modules/server/containers/apps/umami.nix
@@ -39,12 +39,7 @@ in {
         # DISABLE_LOGIN = "1";#(if serverCfg.containers?authentik then "1" else "0");
 
       };
-      extraLabels = { 
-        "traefik.http.middlewares.umami-global.plugin.umami-feeder.umamiHost" = "http://umami-server:3000";
-        "traefik.http.middlewares.umami-global.plugin.umami-feeder.umamiUsername" = "admin";
-        "traefik.http.middlewares.umami-global.plugin.umami-feeder.umamiPassword" = "umami";
-        "traefik.http.middlewares.umami-global.plugin.umami-feeder.createNewWebsites" = "true";
-      } // ( if serverCfg.containers?authentik then {
+      extraLabels = { } // ( if serverCfg.containers?authentik then {
         "traefik.http.routers.${containerCfg.subdomain}.middlewares" = if serverCfg.containers?authentik then "authentik" else "";
       } else {});
       extraOptions = [