Fix deprecation warnings

See NixOS/nixpkgs#45786
input-output-hk · Jun 25, 2021 · a2783aa · a2783aa
1 parent d609a64
commit a2783aa
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/modules/ingress-config.nix b/modules/ingress-config.nix
@@ -186,6 +186,9 @@ in {
         TimeoutStopSec = "30s";
         RestartSec = "10s";
         Restart = "on-failure";
+      };
+
+      unitConfig = {
         StartLimitInterval = "20s";
         StartLimitBurst = 10;
       };

diff --git a/modules/ingress.nix b/modules/ingress.nix
@@ -10,6 +10,12 @@
       description = "HAProxy (ingress)";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+
+      unitConfig = {
+        StartLimitInterval = "20s";
+        StartLimitBurst = 10;
+      };
+
       serviceConfig = let
         preScript = pkgs.writeShellScript "ingress-start-pre" ''
           export PATH="${lib.makeBinPath [ pkgs.coreutils ]}"
@@ -50,8 +56,6 @@
         KillMode = "mixed";
         SuccessExitStatus = "143";
         Restart = "always";
-        StartLimitInterval = "20s";
-        StartLimitBurst = 10;
         TimeoutStopSec = "30s";
         RestartSec = "5s";
         # upstream hardening options

diff --git a/modules/nomad-autoscaler.nix b/modules/nomad-autoscaler.nix
@@ -600,6 +600,11 @@ in {
       restartIfChanged = false;
       reloadIfChanged = true;
 
+      unitConfig = {
+        StartLimitInterval = "20s";
+        StartLimitBurst = 10;
+      };
+
       serviceConfig = {
         StateDirectory = "nomad-autoscaler";
         RuntimeDirectory = "nomad-autoscaler";
@@ -627,8 +632,6 @@ in {
         # support reloading: HUP tells autoscaler to reload config files
         ExecReload = [ "${pkgs.coreutils}/bin/kill -HUP $MAINPID" ];
         Restart = "on-failure";
-        StartLimitInterval = "20s";
-        StartLimitBurst = 10;
         TimeoutStopSec = "30s";
         RestartSec = "5s";
         # upstream hardening options

diff --git a/modules/vault.nix b/modules/vault.nix
@@ -335,7 +335,11 @@ in {
         (filterAttrs (n: _: hasPrefix "${cfg.configDir}" n)
           config.environment.etc);
 
-      unitConfig.RequiresMountsFor = [ cfg.storagePath ];
+      unitConfig = {
+        RequiresMountsFor = [ cfg.storagePath ];
+        StartLimitInterval = "60s";
+        StartLimitBurst = 3;
+      };
 
       serviceConfig = let
         preScript = pkgs.writeShellScriptBin "vault-start-pre" ''
@@ -369,8 +373,6 @@ in {
         TimeoutStopSec = "30s";
         RestartSec = "10s";
         Restart = "on-failure";
-        StartLimitInterval = "60s";
-        StartLimitBurst = 3;
       };
     };