From 8cf92a4415639757fa75d9f1d384f3b21b3e8e0a Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 10 Jan 2021 21:08:12 +0100
Subject: [PATCH] Fix config deploy script

---
 nixos/roles/laminar/test-config.nix | 42 ++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/nixos/roles/laminar/test-config.nix b/nixos/roles/laminar/test-config.nix
index 8b5a9b67..45299cd1 100644
--- a/nixos/roles/laminar/test-config.nix
+++ b/nixos/roles/laminar/test-config.nix
@@ -40,13 +40,8 @@ let
       ${pkgs.test-system-config}/bin/test-system-config $REPODIR ${host}
     '';
   });
-  deployCommand = "${let user = "maralorn";
-  in pkgs.writeShellScript "deploy-system-config" ''
-    /run/wrappers/bin/sudo -u ${user} git -C /etc/nixos pull --ff-only
-    /run/wrappers/bin/sudo -u ${user} git -C /etc/nixos submodule update --init
-    /var/cache/gc-links/result-system-hera/bin/switch-to-configuration switch
-    /run/wrappers/bin/sudo -u ${user} /var/cache/gc-links/result-home-manager-hera/default/activate
-  ''}";
+  deployCommand = "${pkgs.writeShellScript "deploy-system-config"
+    "${pkgs.systemd}/bin/systemctl start update-config"}";
 in {
   services.laminar.cfgFiles.jobs = {
     "test-config.run" = pkgs.writeHaskell "test-config" {
@@ -73,11 +68,34 @@ in {
     }];
     users = [ "laminar" ];
   }];
-  systemd.services.bump-config = {
-    startAt = "03:45";
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.laminar}/bin/laminarc queue bump-config";
+  systemd.services = {
+    update-config = {
+      path = [ pkgs.git pkgs.nix ];
+      restartIfChanged = false;
+      unitConfig.X-StopOnRemoval = false;
+      serviceConfig = {
+        Type = "oneshot";
+        Restart = "on-failure";
+        RestartSec = 1;
+      };
+      unitConfig = {
+        StartLimitIntervalSec = 180;
+        StartLimitBurst = 3;
+      };
+      script = let user = "maralorn";
+      in ''
+        /run/wrappers/bin/sudo -u ${user} git -C /etc/nixos pull --ff-only
+        /run/wrappers/bin/sudo -u ${user} git -C /etc/nixos submodule update --init
+        /var/cache/gc-links/result-system-hera/bin/switch-to-configuration switch
+        /run/wrappers/bin/sudo -u ${user} /var/cache/gc-links/result-home-manager-hera/default/activate
+      '';
+    };
+    bump-config = {
+      startAt = "03:45";
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.laminar}/bin/laminarc queue bump-config";
+      };
     };
   };
 }