fix(nixos): use fixed startup timeouts

This commit is contained in:
2026-09-12 19:58:03 -04:00
parent 3a3bdfad16
commit 8ff4d4f0fa
2 changed files with 3 additions and 20 deletions

View File

@@ -65,13 +65,6 @@
default = [ ];
description = "TCP ports opened for the game service.";
};
startupTimeout = lib.mkOption {
type = lib.types.str;
default = "15min";
example = "30min";
description = "Time systemd allows SteamCMD update and server startup to complete.";
};
};
config = lib.mkMerge [
@@ -145,7 +138,7 @@
WorkingDirectory = "-${service.steamDir}";
ExecStartPre = "+${prepareScript}";
ExecStart = updateScript;
TimeoutStartSec = service.startupTimeout;
TimeoutStartSec = "15min";
};
};
@@ -169,7 +162,7 @@
];
ExecStart = startScript;
Restart = "on-failure";
TimeoutStartSec = service.startupTimeout;
TimeoutStartSec = "15min";
};
};
};

View File

@@ -134,16 +134,6 @@ let
default = { };
description = "NixOS module imported into the guest interior.";
};
startupTimeout = lib.mkOption {
type = lib.types.str;
default = "10min";
example = "30min";
description = ''
Time the host waits for this guest to finish booting before treating
container startup as failed.
'';
};
limits = {
memory = lib.mkOption {
type = lib.types.nullOr lib.types.str;
@@ -233,7 +223,7 @@ let
wants = [ bridgeDevice ];
serviceConfig = lib.filterAttrs (_: v: v != null) {
TimeoutStartSec = lib.mkForce cfg.startupTimeout;
TimeoutStartSec = lib.mkForce "10min";
MemoryMax = cfg.limits.memory;
CPUQuota = cfg.limits.cpu;
TasksMax = cfg.limits.tasksMax;