From 6840ea1191dd7fc1ad02ae698875e044265d716b Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 25 Jul 2015 00:04:04 +0200
Subject: tv.identity -> krebs.build + extraHosts hack

---
 1systems/tv/cd.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to '1systems/tv/cd.nix')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index c0c41e96c..4b8c40f35 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -7,6 +7,8 @@ let
 in
 
 {
+  krebs.build.host = config.krebs.hosts.cd;
+
   imports = [
     ../../2configs/tv/CAC-Developer-2.nix
     ../../2configs/tv/CAC-CentOS-7-64bit.nix
@@ -32,10 +34,6 @@ in
       tv.iptables.input-internet-accept-new-tcp =
         singleton config.krebs.github-hosts-sync.port;
     }
-    {
-      imports = [ ../../2configs/tv/identity.nix ];
-      tv.identity.self = config.krebs.hosts.cd;
-    }
     {
       tv.iptables = {
         enable = true;
-- 
cgit v1.2.3


From a489c7be84ffa76bb71542277af6c114c40961f2 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 25 Jul 2015 00:44:51 +0200
Subject: tv: source pubkeys from registry

---
 1systems/tv/cd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '1systems/tv/cd.nix')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index 4b8c40f35..fcaf19cb5 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -120,8 +120,8 @@ in
       home = "/home/mv";
       createHome = true;
       useDefaultShell = true;
-      openssh.authorizedKeys.keys = map readFile [
-        ../../Zpubkeys/mv_vod.ssh.pub
+      openssh.authorizedKeys.keys = [
+        config.krebs.users.mv.pubkey
       ];
     };
   };
-- 
cgit v1.2.3


From 8d7c80aac644558768a689012d7b31d23f559d66 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 25 Jul 2015 01:38:26 +0200
Subject: {1 tv * -> 2 tv base} networking.hostName

---
 1systems/tv/cd.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to '1systems/tv/cd.nix')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index fcaf19cb5..6913508b5 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -84,7 +84,6 @@ in
     }
   ];
 
-  networking.hostName = "cd";
   networking.interfaces.enp2s1.ip4 = [
     {
       address = "162.219.7.216";
-- 
cgit v1.2.3