From 26e43d47a729df42ed81ac351ea7ba62cea5c102 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 17 Apr 2016 00:03:33 +0200
Subject: k 3 retiolum: add description to configure Address=

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

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index 61b4473e1..6708ae9e4 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -119,6 +119,10 @@ let
         The list of hosts in the network which the client will try to connect
         to.  These hosts should have an 'Address' configured which points to a
         routeable IPv4 or IPv6 address.
+
+        In stockholm this can be done by configuring:
+          host.nets.${netname?"retiolum"}.via.addrs4 =
+            [ "${external-ip} ${external-port}" ]
       '';
     };
 
-- 
cgit v1.2.3


From f04392966859429e73448e890bdadf6100e4b000 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 17 Apr 2016 02:04:33 +0200
Subject: k 3 retiolum: use more precise description for connectTo

---
 krebs/3modules/retiolum.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index 6708ae9e4..422935848 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -121,7 +121,7 @@ let
         routeable IPv4 or IPv6 address.
 
         In stockholm this can be done by configuring:
-          host.nets.${netname?"retiolum"}.via.addrs4 =
+          krebs.hosts.${connect-host}.nets.${netname?"retiolum"}.via.addrs4 =
             [ "${external-ip} ${external-port}" ]
       '';
     };
-- 
cgit v1.2.3


From e4251e63ac983885466c5c5ebfb71e071e8bcfc4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 2 May 2016 17:36:16 +0200
Subject: k 3 fetchWallpaper: move only if exists

---
 krebs/3modules/fetchWallpaper.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix
index 53fe0839d..bd3d6d3b2 100644
--- a/krebs/3modules/fetchWallpaper.nix
+++ b/krebs/3modules/fetchWallpaper.nix
@@ -42,9 +42,11 @@ let
 
   fetchWallpaperScript = pkgs.writeScript "fetchWallpaper" ''
     #! ${pkgs.bash}/bin/bash
+    set -euf
 
     mkdir -p ${shell.escape cfg.stateDir}
-    curl -s -o ${shell.escape cfg.stateDir}/wallpaper -z ${shell.escape cfg.stateDir}/wallpaper ${shell.escape cfg.url}
+    cd ${shell.escape cfg.stateDir}
+    curl -s -o wallpaper.tmp -z wallpaper ${shell.escape cfg.url} && mv wallpaper.tmp wallpaper
     feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper
   '';
 
-- 
cgit v1.2.3


From 56ca7859fab1ad3c1a0a7b5ebf10140b218a60be Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 7 May 2016 00:21:56 +0200
Subject: k 3 m: fix filebitch key

---
 krebs/3modules/makefu/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index bd7c0db48..f9af577b6 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -479,12 +479,12 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB
           ];
           tinc.pubkey = ''
             -----BEGIN RSA PUBLIC KEY-----
-            MIIBCgKCAQEA961eCQE562VPYjuZtd0+FNRfUghvD2ccjUlihMjzg46GAK+duqK+
-            4peWklGOL4eRYQBg6G2VDzWiU2MxXVbXUZaMrxh7fTc3G3LdbqTxzAv3GQKR/6iA
-            9bGUf6u4ztVNAcj2mrY3mfs4gMlBQyQ2wcM0ZUpiAMaRB4cdq7I4GVHbYTFYfQuI
-            2zdnr0w8AjlMpFFcD0ExsWeppiJsE7iiME/S2VVfh2NrEpAKQbLH9fKrfkiJA/+9
-            0VIH9wLLIYngUtQKbvEQ5xgx6ybrg0vO8ZqZ1ZGXYxOQZzWzPP0tvDU0QHSKYSWb
-            FjcOf1lWSWjsjHxMl/Gh57hjNJFCbs8yjQIDAQAB
+            MIIBCgKCAQEA2VjW30A3uQoo5QwbFTnl5fuGg81DZVu8HXmDwgEkhZYr5Xf3V5/d
+            fmPlX1igzatWYX0OylFAY69r0V4dqeTubIf83sz1eqtpXjK4czG8A3wMHEXj5Pzs
+            e1Qh8K4rHMEATc7Y/cwpQBi2THn2bhufqgaz94m8HrStCZcKCin3fDMbE01WHWX1
+            KFqeBtUd7b9pWbXKlLBNpHTZoGxVQk0Hto9pxYzHecRsbQXykYk3Rw2tSuf0aH99
+            oY0i3LjOb+f2oq2S4qVHqHZsMJfDVr+x2/LP1SIcc1lVTztWSSAzZEokE0/ejvXf
+            wkquBVHXdl6LuzH+/V1I7OsaMhHShYu1LwIDAQAB
             -----END RSA PUBLIC KEY-----
           '';
         };
-- 
cgit v1.2.3