From fee87e58cc11353b115d9f1ce12d2caa2f26907b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 28 Nov 2017 19:40:03 +0100
Subject: types: use cidr only in tinc.subnets

---
 lib/types.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index 08dc097..c3b14d8 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -92,7 +92,7 @@ rec {
         default = null;
       };
       addrs = mkOption {
-        type = listOf cidr;
+        type = listOf addr;
         default =
           optional (config.ip4 != null) config.ip4.addr ++
           optional (config.ip6 != null) config.ip6.addr;
@@ -155,6 +155,8 @@ rec {
                 ++
                 (map (a: "Subnet = ${a}") net.addrs)
                 ++
+                (map (a: "Subnet = ${a}") config.subnets)
+                ++
                 [config.extraConfig]
                 ++
                 [config.pubkey]
@@ -173,6 +175,11 @@ rec {
               description = "tinc port to use to connect to host";
               default = 655;
             };
+            subnets = mkOption {
+              type = listOf cidr;
+              description = "tinc subnets";
+              default = [];
+            };
           };
         }));
         default = null;
-- 
cgit v1.2.3


From 2971e1e8a5dbb2a320c87a6243b382b4d3411348 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 26 Nov 2017 16:10:06 +0100
Subject: tv backup: add nomic-pull-querel-home

---
 tv/2configs/backup.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix
index f76fb2e..14d3815 100644
--- a/tv/2configs/backup.nix
+++ b/tv/2configs/backup.nix
@@ -22,6 +22,12 @@ with import <stockholm/lib>;
       dst = { host = config.krebs.hosts.zu; path = "/bku/nomic-home"; };
       startAt = "04:20";
     };
+    nomic-pull-querel-home = {
+      method = "pull";
+      src = { host = config.krebs.hosts.querel; path = "/home"; };
+      dst = { host = config.krebs.hosts.nomic; path = "/fs/ponyhof/bku/querel-home"; };
+      startAt = "00:00";
+    };
     wu-home-xu = {
       method = "push";
       src = { host = config.krebs.hosts.wu; path = "/home"; };
-- 
cgit v1.2.3