From 3e4e5e5c098341667087eb1255912c40f3371863 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 19 Jun 2017 01:00:36 +0200
Subject: tv: admit dummy_secrets

---
 tv/2configs/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index b1d739ef3..b6c8e4393 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -9,7 +9,10 @@ with import <stockholm/lib>;
     user = config.krebs.users.tv;
     source = let inherit (config.krebs.build) host; in {
       nixos-config.symlink = "stockholm/tv/1systems/${host.name}.nix";
-      secrets.file = "/home/tv/secrets/${host.name}";
+      secrets.file =
+        if getEnv "dummy_secrets" == "true"
+          then toString <stockholm/null>
+          else "/home/tv/secrets/${host.name}";
       secrets-common.file = "/home/tv/secrets/common";
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
-- 
cgit v1.2.3


From f6bb11676deb080096ba5ce335df82d6a0b3ac9c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 19 Jun 2017 01:01:04 +0200
Subject: tv nixpkgs: 99dfb6d -> 412b0a1

---
 tv/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index b6c8e4393..13fc73aa7 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -17,7 +17,7 @@ with import <stockholm/lib>;
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
-        ref = "99dfb6dce37edcd1db7cb85c2db97089d9d5f442"; # nixos-17.03
+        ref = "412b0a17aa2975e092c7ab95a38561c5f82908d4"; # nixos-17.03
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";
-- 
cgit v1.2.3


From 094feb9b4ac1334f6d1390592a52c755083e57d0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 19 Jun 2017 01:01:29 +0200
Subject: tv: add whatsupnix

---
 tv/2configs/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 13fc73aa7..93b9c0122 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -44,6 +44,7 @@ with import <stockholm/lib>;
         gnumake
         hashPassword
         populate
+        whatsupnix
       ];
     }
     {
-- 
cgit v1.2.3


From 57c6b890f9088bb333eeab215ecfeca9d09ce3ef Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 20 Jun 2017 00:02:04 +0200
Subject: tv dummy_secrets: init

---
 tv/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/2configs/default.nix')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 93b9c0122..4a1247ef5 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -11,7 +11,7 @@ with import <stockholm/lib>;
       nixos-config.symlink = "stockholm/tv/1systems/${host.name}.nix";
       secrets.file =
         if getEnv "dummy_secrets" == "true"
-          then toString <stockholm/null>
+          then toString <stockholm/tv/dummy_secrets>
           else "/home/tv/secrets/${host.name}";
       secrets-common.file = "/home/tv/secrets/common";
       stockholm.file = "/home/tv/stockholm";
-- 
cgit v1.2.3