summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-12-16 15:42:08 -0800
committerWilliam A. Kennington III <william@wkennington.com>2014-12-16 15:42:08 -0800
commit681ae2fa7fa8682da1ee6d3d9d5b48697ca64ee5 (patch)
treee3cab55dbe2397613380e7339752fe87f1ba18c4 /nixos
parent56908ab49f2f9f88a4299ca1b224594a27a2f6aa (diff)
downloadnixlib-681ae2fa7fa8682da1ee6d3d9d5b48697ca64ee5.tar
nixlib-681ae2fa7fa8682da1ee6d3d9d5b48697ca64ee5.tar.gz
nixlib-681ae2fa7fa8682da1ee6d3d9d5b48697ca64ee5.tar.bz2
nixlib-681ae2fa7fa8682da1ee6d3d9d5b48697ca64ee5.tar.lz
nixlib-681ae2fa7fa8682da1ee6d3d9d5b48697ca64ee5.tar.xz
nixlib-681ae2fa7fa8682da1ee6d3d9d5b48697ca64ee5.tar.zst
nixlib-681ae2fa7fa8682da1ee6d3d9d5b48697ca64ee5.zip
nixos/consul: Don't timeout if start job has many retries
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/consul.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index c5f5bd79c1a9..b2d5854fbc0c 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -150,6 +150,7 @@ in
         ExecReload = "${pkgs.consul}/bin/consul reload";
         PermissionsStartOnly = true;
         User = if cfg.dropPrivileges then "consul" else null;
+        TimeoutStartSec = "${toString (20 + (3 * cfg.joinRetries))}s";
       } // (optionalAttrs (cfg.leaveOnStop) {
         ExecStop = "${pkgs.consul}/bin/consul leave";
       });