diff --git a/modules/services/lib.nix b/modules/services/lib.nix index 12fd25d..fca2a3b 100644 --- a/modules/services/lib.nix +++ b/modules/services/lib.nix @@ -112,7 +112,7 @@ ${concatStringsSep "\n" (map (m: " - ${m}") middlewares)} Type = "exec"; ExecStartPre = [ "${pkgs.bash}/bin/bash -c 'sleep $((RANDOM % ${toString startDelay}))'" - "- ${pkgs.sudo}/bin/sudo -u numbus-admin podman-compose ${envFileArg} -f /etc/podman/${name}/compose.yaml pull" + "${pkgs.sudo}/bin/sudo -u numbus-admin podman-compose ${envFileArg} -f /etc/podman/${name}/compose.yaml pull" ]; ExecStart = "${pkgs.sudo}/bin/sudo -u numbus-admin podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml up --remove-orphans"; ExecStop = "${pkgs.sudo}/bin/sudo -u numbus-admin podman-compose ${envFileArg} --in-pod ${toString pod} -f /etc/podman/${name}/compose.yaml down"; diff --git a/modules/services/pi-hole.nix b/modules/services/pi-hole.nix index 68dd429..d663c0d 100644 --- a/modules/services/pi-hole.nix +++ b/modules/services/pi-hole.nix @@ -19,7 +19,7 @@ helper.mkPodmanService { scheme = "https"; dependencies = [ "network.target" "multi-user.target" ]; dataDir = false; - delaySec = 10; + startDelay = 10; generatedSecrets = { PIHOLE_PASSWORD = "xkcdpass -n 10 -d -"; }; diff --git a/modules/services/traefik.nix b/modules/services/traefik.nix index bb660c9..0fe6a7c 100644 --- a/modules/services/traefik.nix +++ b/modules/services/traefik.nix @@ -18,7 +18,7 @@ helper.mkPodmanService { reverseProxied = false; dependencies = [ "network.target" "multi-user.target" ]; dataDir = false; - delaySec = 10; + startDelay = 10; generatedSecrets = { CLOUDFLARE_DNS_API_TOKEN = "cat ${config.numbus.mail.smtpPasswordPath}"; };