diff --git a/configs/nixos/modules/services/steamcmd.nix b/configs/nixos/modules/services/steamcmd.nix index ac72d29..4720fc4 100644 --- a/configs/nixos/modules/services/steamcmd.nix +++ b/configs/nixos/modules/services/steamcmd.nix @@ -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"; }; }; }; diff --git a/src/dotfiles/guests.nix b/src/dotfiles/guests.nix index ddf47ed..9b9db94 100644 --- a/src/dotfiles/guests.nix +++ b/src/dotfiles/guests.nix @@ -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;