From 873e1f90025f7eb1b13607130dbc4164cc2a0c44 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 12:34:25 +0200
Subject: 3 tv retiolum: RIP

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

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

diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index e0e057d..05d76c4 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -29,8 +29,8 @@ with lib;
       };
     }
     {
-      imports = [ ../../3modules/tv/retiolum.nix ];
-      tv.retiolum = {
+      imports = [ ../../3modules/krebs/retiolum.nix ];
+      krebs.retiolum = {
         enable = true;
         hosts = ../../Zhosts;
         connectTo = [
-- 
cgit v1.2.3


From 1fa2d83e3cdd3305fde7751d0c3ae64d5f8fed48 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 12:41:41 +0200
Subject: krebs.retiolum: define type of hosts

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

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

diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index 05d76c4..823f044 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -32,7 +32,6 @@ with lib;
       imports = [ ../../3modules/krebs/retiolum.nix ];
       krebs.retiolum = {
         enable = true;
-        hosts = ../../Zhosts;
         connectTo = [
           "cd"
           "fastpoke"
-- 
cgit v1.2.3


From 4165440f467e2c573ba248ae9cdcae54d1488bc5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 17:34:08 +0200
Subject: autoimport 3*/{krebs,$(LOGNAME)}

---
 1systems/tv/mkdir.nix | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index 823f044..03d0c00 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -15,7 +15,6 @@ with lib;
       tv.identity.self = config.tv.identity.hosts.mkdir;
     }
     {
-      imports = [ ../../3modules/tv/iptables.nix ];
       tv.iptables = {
         enable = true;
         input-internet-accept-new-tcp = [
@@ -29,7 +28,6 @@ with lib;
       };
     }
     {
-      imports = [ ../../3modules/krebs/retiolum.nix ];
       krebs.retiolum = {
         enable = true;
         connectTo = [
-- 
cgit v1.2.3


From e1d542e07d5ee9c26a04f273b0eb6ff8adccf756 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 19:33:20 +0200
Subject: tv git: add restricted repos

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

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

diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index 03d0c00..3e5fb72 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -9,7 +9,7 @@ with lib;
     ../../2configs/tv/base.nix
     ../../2configs/tv/consul-server.nix
     ../../2configs/tv/exim-smarthost.nix
-    ../../2configs/tv/git-public.nix
+    ../../2configs/tv/git.nix
     {
       imports = [ ../../2configs/tv/identity.nix ];
       tv.identity.self = config.tv.identity.hosts.mkdir;
-- 
cgit v1.2.3


From c9b3c530a6902979feaba0b07e3b6542708a72f5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 21:15:18 +0200
Subject: { * tv identity -> 3 krebs}.hosts

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

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

diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index 3e5fb72..113fc95 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -12,7 +12,7 @@ with lib;
     ../../2configs/tv/git.nix
     {
       imports = [ ../../2configs/tv/identity.nix ];
-      tv.identity.self = config.tv.identity.hosts.mkdir;
+      tv.identity.self = config.krebs.hosts.mkdir;
     }
     {
       tv.iptables = {
-- 
cgit v1.2.3


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

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

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

diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index 113fc95..938f501 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -3,6 +3,8 @@
 with lib;
 
 {
+  krebs.build.host = config.krebs.hosts.mkdir;
+
   imports = [
     ../../2configs/tv/CAC-Developer-1.nix
     ../../2configs/tv/CAC-CentOS-7-64bit.nix
@@ -10,10 +12,6 @@ with lib;
     ../../2configs/tv/consul-server.nix
     ../../2configs/tv/exim-smarthost.nix
     ../../2configs/tv/git.nix
-    {
-      imports = [ ../../2configs/tv/identity.nix ];
-      tv.identity.self = config.krebs.hosts.mkdir;
-    }
     {
       tv.iptables = {
         enable = true;
-- 
cgit v1.2.3


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

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

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

diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index 938f501..7542ad0 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -38,7 +38,6 @@ with lib;
     }
   ];
 
-  networking.hostName = "mkdir";
   networking.interfaces.enp2s1.ip4 = [
     {
       address = "162.248.167.241"; # TODO
-- 
cgit v1.2.3