From 9b0c35021946b6619b8da82541896174f06a4560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Numbus?= <admin@numbus.eu>
Date: Wed, 25 Feb 2026 21:39:07 +0100
Subject: [PATCH] Bugfixes.

---
 modules/services/lib.nix       |  4 ++--
 modules/services/nextcloud.nix |  4 ++--
 modules/services/traefik.nix   | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/services/lib.nix b/modules/services/lib.nix
index 500b78d..f406678 100644
--- a/modules/services/lib.nix
+++ b/modules/services/lib.nix
@@ -77,7 +77,7 @@ with lib;
       {
         environment.etc."podman/${name}/compose.yaml".text = composeText;
 
-        environment.etc."${config.numbus.traefikDynamicConfigDir}/${name}.yaml" = mkIf cfg.reverseProxied {
+        environment.etc."${config.numbus.service.traefikDynamicConfigDir}/${name}.yaml" = mkIf cfg.reverseProxied {
           text = ''
           http:
             routers:
@@ -107,7 +107,7 @@ ${concatStringsSep "\n" (map (m: "                  - ${m}") middlewares)}
           onFailure = [ "service-failure-notify@%n.service" ];
           startLimitBurst = 5;
           startLimitIntervalSec = 600;
-          path = [ pkgs.podman pkgs.podman-compose pkgs.coreutils pkgs.sudo ];
+          path = [ pkgs.bash pkgs.podman pkgs.podman-compose pkgs.coreutils pkgs.sudo ];
           serviceConfig = {
             Type = "exec";
             ExecStartPre = [
diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix
index 5c0f02a..a500db5 100644
--- a/modules/services/nextcloud.nix
+++ b/modules/services/nextcloud.nix
@@ -157,7 +157,7 @@ helper.mkPodmanService {
   '';
 
   extraConfig = {
-    environment.etc."${config.numbus.traefikDynamicConfigDir}/nextcloud-onlyoffice.yaml".text = ''
+    environment.etc."${config.numbus.service.traefikDynamicConfigDir}/nextcloud-onlyoffice.yaml".text = ''
       http:
         routers:
           nextcloud-onlyoffice:
@@ -177,7 +177,7 @@ helper.mkPodmanService {
                 - url: "http://host.containers.internal:9980"
     '';
 
-    environment.etc."${config.numbus.traefikDynamicConfigDir}/nextcloud-whiteboard.yaml".text = ''
+    environment.etc."${config.numbus.service.traefikDynamicConfigDir}/nextcloud-whiteboard.yaml".text = ''
       http:
         routers:
           nextcloud-whiteboard:
diff --git a/modules/services/traefik.nix b/modules/services/traefik.nix
index f892db6..0ac042d 100644
--- a/modules/services/traefik.nix
+++ b/modules/services/traefik.nix
@@ -24,8 +24,8 @@ helper.mkPodmanService {
   };
   dirPermissions = [
     "100999:users ${cfg.configDir}"
-    "100999:users /etc/${cfg.staticConfigFile}"
-    "100999:users ${config.numbus.traefikDynamicConfigDir}"
+    "100999:users ${cfg.staticConfigDir}"
+    "100999:users ${config.numbus.service.traefikDynamicConfigDir}"
   ];
 
 # Compose file good
@@ -41,8 +41,8 @@ helper.mkPodmanService {
           - "80:80/tcp"
           - "443:443/tcp"
         volumes:
-          - /etc/${cfg.staticConfigFile}:/etc/traefik/traefik.yaml:ro
-          - ${config.numbus.traefikDynamicConfigDir}:/etc/traefik/conf:ro
+          - ${cfg.staticConfigDir}/config.yaml:/etc/traefik/traefik.yaml:ro
+          - ${config.numbus.service.traefikDynamicConfigDir}:/etc/traefik/conf:ro
           - ${cfg.configDir}:/var/traefik/certs:rw
         environment:
           - CF_DNS_API_TOKEN=$CLOUDFLARE_DNS_API_TOKEN
@@ -99,7 +99,7 @@ helper.mkPodmanService {
           watch: true
     '';
 
-    environment.etc."${config.numbus.traefikDynamicConfigDir}/secureHeaders.yaml".text = ''
+    environment.etc."${config.numbus.service.traefikDynamicConfigDir}/secureHeaders.yaml".text = ''
       http:
         middlewares:
           secureHeaders:
@@ -122,7 +122,7 @@ helper.mkPodmanService {
               STSSeconds: 315360000
     '';
 
-    environment.etc."${config.numbus.traefikDynamicConfigDir}/secureTLS.yaml".text = ''
+    environment.etc."${config.numbus.service.traefikDynamicConfigDir}/secureTLS.yaml".text = ''
       tls:
         options:
           secureTLS:
@@ -140,10 +140,10 @@ helper.mkPodmanService {
 
   extraOptions = {
     enable.default = true;
-    staticConfigFile = mkOption {
+    staticConfigFileDir = mkOption {
       type = types.str;
-      default = "traefik/config.yaml";
-      description = "The path for Traefik's static configuration file, relative to /etc/";
+      default = "/etc/traefik";
+      description = "The path of the directory containing Traefik's static configuration file";
     };
     logLevel = mkOption {
       type = types.enum [ "TRACE" "DEBUG" "INFO" "WARN" "ERROR" "FATAL" ];