diff options
| author | Craig Younkins <cyounkins@gmail.com> | 2018-11-25 07:33:22 -0500 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2018-11-25 13:33:22 +0100 |
| commit | eff461c8ef17210cfd7cf50fe8c057f581663436 (patch) | |
| tree | 8278422459bf71346864c644812ccf09001fabca /nixos/modules/services/monitoring | |
| parent | 377e0e9b0fd01f3415ed21620a7913521e693600 (diff) | |
| download | nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar.gz nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar.bz2 nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar.lz nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar.xz nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar.zst nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.zip | |
treewide: systemd timeout arguments to use infinity instead of 0 (#50934)
Fixes https://github.com/NixOS/nixpkgs/issues/49700
Diffstat (limited to 'nixos/modules/services/monitoring')
| -rw-r--r-- | nixos/modules/services/monitoring/apcupsd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/monitoring/osquery.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index 839116de626..7ee870183ca 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -180,7 +180,7 @@ in serviceConfig = { Type = "oneshot"; ExecStart = "${pkgs.apcupsd}/bin/apcupsd --killpower -f ${configFile}"; - TimeoutSec = 0; + TimeoutSec = "infinity"; StandardOutput = "tty"; RemainAfterExit = "yes"; }; diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix index ba0dc4c2176..c8c625577d3 100644 --- a/nixos/modules/services/monitoring/osquery.nix +++ b/nixos/modules/services/monitoring/osquery.nix @@ -78,7 +78,7 @@ in mkdir -p "$(dirname ${escapeShellArg cfg.databasePath})" ''; serviceConfig = { - TimeoutStartSec = 0; + TimeoutStartSec = "infinity"; ExecStart = "${pkgs.osquery}/bin/osqueryd --logger_path ${escapeShellArg cfg.loggerPath} --pidfile ${escapeShellArg cfg.pidfile} --database_path ${escapeShellArg cfg.databasePath}"; KillMode = "process"; KillSignal = "SIGTERM"; |