8 files changed, 17 insertions, 8 deletions
diff --git a/krebs/2configs/shack/glados/multi/wasser.nix b/krebs/2configs/shack/glados/multi/wasser.nix
index da5cac36d..578bb0750 100644
--- a/krebs/2configs/shack/glados/multi/wasser.nix
+++ b/krebs/2configs/shack/glados/multi/wasser.nix
@@ -12,7 +12,7 @@ let
     retain = false;
     qos = 1;
   };
-  seconds = 30;
+  seconds = 20;
 in
 {
   switch = [
diff --git a/krebs/2configs/shack/mqtt_sub.nix b/krebs/2configs/shack/mqtt_sub.nix
index a8427dde4..bd0b6df85 100644
--- a/krebs/2configs/shack/mqtt_sub.nix
+++ b/krebs/2configs/shack/mqtt_sub.nix
@@ -29,6 +29,8 @@ in {
       User = "nobody";
       ExecStart = "${pkg}/bin/sub-new";
       PrivateTmp = true;
+      Restart = "always";
+      RestartSec = "15";
     };
   };
 }
diff --git a/krebs/2configs/shack/muell_caller.nix b/krebs/2configs/shack/muell_caller.nix
index 19768cb2e..33f6b8c89 100644
--- a/krebs/2configs/shack/muell_caller.nix
+++ b/krebs/2configs/shack/muell_caller.nix
@@ -33,9 +33,10 @@ in {
         chown nobody /tmp/tell.json
       '';
       ExecStart = "${pkg}/bin/call-muell --cfg /tmp/tell.json --mode mpd loop 60";
-      Restart = "always";
       PrivateTmp = true;
       PermissionsStartOnly = true;
+      Restart = "always";
+      RestartSec = "15";
     };
   };
 }
diff --git a/krebs/2configs/shack/muell_mail.nix b/krebs/2configs/shack/muell_mail.nix
index 39d49918d..a41dbc977 100644
--- a/krebs/2configs/shack/muell_mail.nix
+++ b/krebs/2configs/shack/muell_mail.nix
@@ -26,8 +26,9 @@ in {
       WorkingDirectory = home;
       PermissionsStartOnly = true;
       ExecStart = "${pkg}/bin/muell_mail";
-      Restart = "always";
       PrivateTmp = true;
+      Restart = "always";
+      RestartSec = "15";
     };
   };
 }
diff --git a/krebs/2configs/shack/muellshack.nix b/krebs/2configs/shack/muellshack.nix
index 1e6843bdf..9168c9ba7 100644
--- a/krebs/2configs/shack/muellshack.nix
+++ b/krebs/2configs/shack/muellshack.nix
@@ -36,8 +36,9 @@ in {
       '';
       WorkingDirectory = home;
       ExecStart = "${pkg}/bin/muellshack";
-      Restart = "always";
       PrivateTmp = true;
+      Restart = "always";
+      RestartSec = "15";
     };
   };
 }
diff --git a/krebs/2configs/shack/node-light.nix b/krebs/2configs/shack/node-light.nix
index 63772f182..8cf0007b8 100644
--- a/krebs/2configs/shack/node-light.nix
+++ b/krebs/2configs/shack/node-light.nix
@@ -46,8 +46,9 @@ in {
       '';
       WorkingDirectory = home;
       ExecStart = "${pkg}/bin/node-light";
-      Restart = "always";
       PrivateTmp = true;
+      Restart = "always";
+      RestartSec = "15";
     };
   };
 }
diff --git a/krebs/2configs/shack/powerraw.nix b/krebs/2configs/shack/powerraw.nix
index af3f129c1..4118e7a72 100644
--- a/krebs/2configs/shack/powerraw.nix
+++ b/krebs/2configs/shack/powerraw.nix
@@ -22,8 +22,9 @@ in {
     serviceConfig = {
       User = "powermeter";
       ExecStart = "${pkg}/bin/powermeter-serial2mqtt";
-      Restart = "always";
       PrivateTmp = true;
+      Restart = "always";
+      RestartSec = "15";
     };
   };
 
@@ -33,8 +34,9 @@ in {
     serviceConfig = {
       User = "powermeter";
       ExecStart = "${pkg}/bin/powermeter-mqtt2socket";
-      Restart = "always";
       PrivateTmp = true;
+      Restart = "always";
+      RestartSec = "15";
     };
   };
 
diff --git a/krebs/2configs/shack/radioactive.nix b/krebs/2configs/shack/radioactive.nix
index 566146d6e..286a73aae 100644
--- a/krebs/2configs/shack/radioactive.nix
+++ b/krebs/2configs/shack/radioactive.nix
@@ -27,9 +27,10 @@ in {
     serviceConfig = {
       User = "nobody"; # TODO separate user
       ExecStart = "${pkg}/bin/radioactive-add-many loop 60";
-      Restart = "always";
       PrivateTmp = true;
       PermissionsStartOnly = true;
+      Restart = "always";
+      RestartSec = "15";
     };
   };
 }