diff --git a/modules/services/lib.nix b/modules/services/lib.nix index 541b7cb..7ac3ef2 100644 --- a/modules/services/lib.nix +++ b/modules/services/lib.nix @@ -107,11 +107,11 @@ ${concatStringsSep "\n" (map (m: " - ${m}") middlewares)} onFailure = [ "service-failure-notify@%n.service" ]; startLimitBurst = 5; startLimitIntervalSec = 600; - path = [ pkgs.bash pkgs.podman pkgs.podman-compose pkgs.coreutils pkgs.sudo ]; + path = [ pkgs.podman pkgs.podman-compose pkgs.coreutils pkgs.sudo ]; serviceConfig = { Type = "exec"; ExecStartPre = [ - "bash -c 'sleep $((RANDOM % ${toString startDelay}))'" + "sleep $(shuf -i 1-${toString startDelay} -n 1)" "- sudo -u numbus-admin podman-compose ${envFileArg} -f /etc/podman/${name}/compose.yaml pull" ]; ExecStart = "sudo -u numbus-admin podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml up --remove-orphans"; diff --git a/modules/services/traefik.nix b/modules/services/traefik.nix index 74ac589..bb660c9 100644 --- a/modules/services/traefik.nix +++ b/modules/services/traefik.nix @@ -24,8 +24,6 @@ helper.mkPodmanService { }; dirPermissions = [ "100999:users ${cfg.configDir}" - "100999:users /etc/${cfg.traefikStaticConfigDir}" - "100999:users /etc/${config.numbus.services.traefikDynamicConfigDir}" ]; # Compose file good