From e09559bb786c7cf639dc1428bbe2ed6ba7ced9fb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Jan 2016 21:47:55 +0100
Subject: krebs.backup.plans.*.{snapshots,startAt} += default

---
 krebs/3modules/backup.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix
index 01bb16a2b..20bc5dee0 100644
--- a/krebs/3modules/backup.nix
+++ b/krebs/3modules/backup.nix
@@ -28,9 +28,17 @@ let
             type = types.krebs.file-location;
           };
           startAt = mkOption {
-            type = types.str;
+            default = "hourly";
+            type = types.str; # TODO systemd.time(7)'s calendar event
           };
           snapshots = mkOption {
+            default = {
+              hourly   = { format = "%Y-%m-%dT%H"; retain =  4; };
+              daily    = { format = "%Y-%m-%d";    retain =  7; };
+              weekly   = { format = "%YW%W";       retain =  4; };
+              monthly  = { format = "%Y-%m";       retain = 12; };
+              yearly   = { format = "%Y";                       };
+            };
             type = types.attrsOf (types.submodule {
               options = {
                 format = mkOption {
-- 
cgit v1.3.1


From b44615eebec6055f3b49a8170354ce4bb3213cb4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Jan 2016 22:35:05 +0100
Subject: tv backup: wu:/home → xu:/bku/wu-home @ 05:00
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 krebs/3modules/tv/default.nix |  1 +
 tv/2configs/backup.nix        | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 6fd1c4224..31c1a375a 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -247,6 +247,7 @@ with lib;
         };
       };
       secure = true;
+      ssh.privkey.path = <secrets/ssh.id_ed25519>;
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcJvu8JDVzObLUtlAQg9qVugthKSfitwCljuJ5liyHa";
     };
     xu = {
diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix
index 4b31bc844..ce937a744 100644
--- a/tv/2configs/backup.nix
+++ b/tv/2configs/backup.nix
@@ -2,20 +2,17 @@
 with lib;
 {
   krebs.backup.plans = addNames {
-    xu-test-cd = {
+    wu-home-xu = {
       method = "push";
-      src = { host = config.krebs.hosts.xu; path = "/tmp/xu-test"; };
-      dst = { host = config.krebs.hosts.cd; path = "/tmp/backups/xu-test"; };
+      src = { host = config.krebs.hosts.wu; path = "/home"; };
+      dst = { host = config.krebs.hosts.xu; path = "/bku/wu-home"; };
+      startAt = "05:00";
+      snapshots = {
+        daily    = { format = "%Y-%m-%d";    retain =  7; };
+        weekly   = { format = "%YW%W";       retain =  4; };
+        monthly  = { format = "%Y-%m";       retain = 12; };
+        yearly   = { format = "%Y";                       };
+      };
     };
-    #xu-test-wu = {
-    #  method = "push";
-    #  dst = { user = tv; host = wu; path = "/krebs/backup/xu-test"; };
-    #};
-    cd-test-xu = {
-      method = "pull";
-      src = { host = config.krebs.hosts.cd; path = "/tmp/cd-test"; };
-      dst = { host = config.krebs.hosts.xu; path = "/tmp/backups/cd-test"; };
-    };
-
   };
 }
-- 
cgit v1.3.1


From 8647055f0cc1cd4b4b1b389b3b7c2f4ee2211e93 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 5 Jan 2016 22:57:16 +0100
Subject: krebs.backup: add TODOs

---
 krebs/3modules/backup.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix
index 20bc5dee0..a1f335905 100644
--- a/krebs/3modules/backup.nix
+++ b/krebs/3modules/backup.nix
@@ -292,3 +292,15 @@ let
   };
 
 in out
+# TODO ionice
+# TODO mail on failed push, pull
+# TODO mail on missing push
+# TODO don't cancel plans on activation
+#   also, don't hang while deploying at:
+#   starting the following units: backup.wu-home-xu.push.service, backup.wu-home-xu.push.timer
+# TODO make sure /bku is properly mounted
+# TODO make sure that secure hosts cannot backup to insecure ones
+# TODO optionally only backup when src and dst are near enough :)
+# TODO try using btrfs for snapshots (configurable)
+# TODO warn if partial snapshots are found
+# TODO warn if unknown stuff is found in dst path
-- 
cgit v1.3.1