From 6e450d6d0a159405a2ab24f64566f80fad348ca3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 9 Apr 2018 16:47:09 +0200
Subject: Massage

---
 custom/lvm-snapshots.nix |  4 +++-
 hel.nix                  | 16 ++++++++--------
 odin.nix                 |  8 ++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/custom/lvm-snapshots.nix b/custom/lvm-snapshots.nix
index 29156988..04ab06f0 100644
--- a/custom/lvm-snapshots.nix
+++ b/custom/lvm-snapshots.nix
@@ -82,7 +82,7 @@ in {
       
       script = ''
         (
-          flock -xn 9 || exit 1
+          flock -xn 9 -E 4 || exit 1
           
           lvcreate -s ${scfg.cowSize} --name ${snapshotName name} ${scfg.VG}/${scfg.LV}
 
@@ -96,6 +96,8 @@ in {
 
       serviceConfig = with pkgs; {
         Type = "forking";
+        RestartForceExitStatus = [ "4" ];
+        RestartSec = "5min";
       };
     }) cfg.snapshots;
 
diff --git a/hel.nix b/hel.nix
index b38c4814..3ec583dd 100644
--- a/hel.nix
+++ b/hel.nix
@@ -525,10 +525,10 @@
         paths = [ "/home/gkleen" ];
         prune = {
           "/home/gkleen" =
-            [ "--keep-within 24H"
-              "--keep-daily 31"
-              "--keep-monthly 12"
-              "--keep-yearly -1"
+            [ "--keep-within" "24H"
+              "--keep-daily" "31"
+              "--keep-monthly" "12"
+              "--keep-yearly" "-1"
             ];
         };
       };
@@ -537,10 +537,10 @@
         paths = [ "/home/gkleen" ];
         prune = {
           "/home/gkleen" =
-            [ "--keep-within 24H"
-              "--keep-daily 31"
-              "--keep-monthly 12"
-              "--keep-yearly -1"
+            [ "--keep-within" "24H"
+              "--keep-daily" "31"
+              "--keep-monthly" "12"
+              "--keep-yearly" "-1"
             ];
         };
       };
diff --git a/odin.nix b/odin.nix
index 1987ea82..321535b1 100644
--- a/odin.nix
+++ b/odin.nix
@@ -165,10 +165,10 @@
         prune = lib.genAttrs
           ["raid6/mail" "raid6/home" "raid6/media" "raid6/root" "ssd-raid1/root"]
           (name: [
-            "--keep-within 24H"
-            "--keep-daily 31"
-            "--keep-monthly 12"
-            "--keep-yearly -1"
+            "--keep-within" "24H"
+            "--keep-daily" "31"
+            "--keep-monthly" "12"
+            "--keep-yearly" "-1"
           ]);
       };
     };
-- 
cgit v1.2.3