From bbdfb268e701519ff172b43bd01d3740a47a8ef6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 09:38:59 +0200
Subject: tv urlwatch: simple-evcorr has moved to GitHub

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

(limited to '1systems/tv')

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 400005c..76bb43e 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -168,7 +168,7 @@ in
           # then we have to update the package
 
           # ref src/nixpkgs/pkgs/tools/admin/sec/default.nix
-          http://simple-evcorr.sourceforge.net/
+          https://api.github.com/repos/simple-evcorr/sec/tags
 
           # ref src/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
           https://thp.io/2008/urlwatch/
-- 
cgit v1.2.3


From 6a0dc8e6d766fe4e970e7b360fbb2bbe79421853 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 11:50:23 +0200
Subject: 3 {tv -> krebs}.nginx

---
 1systems/tv/cd.nix    | 10 +++++-----
 1systems/tv/nomic.nix |  4 ++--
 1systems/tv/wu.nix    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to '1systems/tv')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index d3cae6f..407fc25 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -57,19 +57,19 @@ in
     {
       imports = [
         ../../3modules/tv/iptables.nix
-        ../../3modules/tv/nginx.nix
+        ../../3modules/krebs/nginx.nix
       ];
       tv.iptables.input-internet-accept-new-tcp = singleton "http";
-      tv.nginx.servers.cgit.server-names = singleton "cgit.cd.viljetic.de";
+      krebs.nginx.servers.cgit.server-names = singleton "cgit.cd.viljetic.de";
     }
     {
       # TODO make public_html also available to cd, cd.retiolum (AKA default)
       imports = [
         ../../3modules/tv/iptables.nix
-        ../../3modules/tv/nginx.nix
+        ../../3modules/krebs/nginx.nix
       ];
       tv.iptables.input-internet-accept-new-tcp = singleton "http";
-      tv.nginx.servers.public_html = {
+      krebs.nginx.servers.public_html = {
         server-names = singleton "cd.viljetic.de";
         locations = singleton (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
           alias /home/$1/public_html$2;
@@ -77,7 +77,7 @@ in
       };
     }
     {
-      tv.nginx.servers.viljetic = {
+      krebs.nginx.servers.viljetic = {
         server-names = singleton "viljetic.de";
         # TODO directly set root (instead via location)
         locations = singleton (nameValuePair "/" ''
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index 6f984c4..8e6812e 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -26,8 +26,8 @@ with lib;
       };
     }
     {
-      imports = [ ../../3modules/tv/nginx.nix ];
-      tv.nginx = {
+      imports = [ ../../3modules/krebs/nginx.nix ];
+      krebs.nginx = {
         enable = true;
         servers.default.locations = [
           (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 76bb43e..7a12bc5 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -134,8 +134,8 @@ in
       };
     }
     {
-      imports = [ ../../3modules/tv/nginx.nix ];
-      tv.nginx = {
+      imports = [ ../../3modules/krebs/nginx.nix ];
+      krebs.nginx = {
         enable = true;
         servers.default.locations = [
           (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
-- 
cgit v1.2.3


From 6e66334ec650a37eca46d4ae85b10fc8200ef460 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 11:55:16 +0200
Subject: 3: {tv -> krebs}.urlwatch

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

(limited to '1systems/tv')

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 7a12bc5..1d7bbe5 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -156,8 +156,8 @@ in
       };
     }
     {
-      imports = [ ../../3modules/tv/urlwatch.nix ];
-      tv.urlwatch = {
+      imports = [ ../../3modules/krebs/urlwatch.nix ];
+      krebs.urlwatch = {
         enable = true;
         mailto = "tv@wu.retiolum"; # TODO
         onCalendar = "*-*-* 05:00:00";
-- 
cgit v1.2.3


From 4e846ab7b38bc6c5ecf8213a027cc8ec4fa819d8 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 12:03:51 +0200
Subject: 3: {tv -> krebs}.github-hosts-sync

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

(limited to '1systems/tv')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index 407fc25..463d643 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -29,10 +29,10 @@ in
       };
     }
     {
-      imports = [ ../../3modules/tv/github-hosts-sync.nix ];
-      tv.github-hosts-sync.enable = true;
+      imports = [ ../../3modules/krebs/github-hosts-sync.nix ];
+      krebs.github-hosts-sync.enable = true;
       tv.iptables.input-internet-accept-new-tcp =
-        singleton config.tv.github-hosts-sync.port;
+        singleton config.krebs.github-hosts-sync.port;
     }
     {
       imports = [ ../../2configs/tv/identity.nix ];
-- 
cgit v1.2.3


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/cd.nix    | 4 ++--
 1systems/tv/mkdir.nix | 4 ++--
 1systems/tv/nomic.nix | 4 ++--
 1systems/tv/rmdir.nix | 4 ++--
 1systems/tv/wu.nix    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to '1systems/tv')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index 463d643..2f8cf81 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -86,8 +86,8 @@ in
       };
     }
     {
-      imports = [ ../../3modules/tv/retiolum.nix ];
-      tv.retiolum = {
+      imports = [ ../../3modules/krebs/retiolum.nix ];
+      krebs.retiolum = {
         enable = true;
         hosts = ../../Zhosts;
         connectTo = [
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 = [
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index 8e6812e..bae12d3 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -37,8 +37,8 @@ with lib;
       };
     }
     {
-      imports = [ ../../3modules/tv/retiolum.nix ];
-      tv.retiolum = {
+      imports = [ ../../3modules/krebs/retiolum.nix ];
+      krebs.retiolum = {
         enable = true;
         hosts = ../../Zhosts;
         connectTo = [
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index b77a1c3..2cf9668 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.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 = [
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 1d7bbe5..c5678a1 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -145,8 +145,8 @@ in
       };
     }
     {
-      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/cd.nix    | 1 -
 1systems/tv/mkdir.nix | 1 -
 1systems/tv/nomic.nix | 1 -
 1systems/tv/rmdir.nix | 1 -
 1systems/tv/wu.nix    | 1 -
 5 files changed, 5 deletions(-)

(limited to '1systems/tv')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index 2f8cf81..bf556e0 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -89,7 +89,6 @@ in
       imports = [ ../../3modules/krebs/retiolum.nix ];
       krebs.retiolum = {
         enable = true;
-        hosts = ../../Zhosts;
         connectTo = [
           "fastpoke"
           "pigstarter"
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"
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index bae12d3..ef4a5ca 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -40,7 +40,6 @@ with lib;
       imports = [ ../../3modules/krebs/retiolum.nix ];
       krebs.retiolum = {
         enable = true;
-        hosts = ../../Zhosts;
         connectTo = [
           "gum"
           "pigstarter"
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index 2cf9668..f15c790 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.nix
@@ -32,7 +32,6 @@ with lib;
       imports = [ ../../3modules/krebs/retiolum.nix ];
       krebs.retiolum = {
         enable = true;
-        hosts = ../../Zhosts;
         connectTo = [
           "cd"
           "mkdir"
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index c5678a1..0b5b828 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -148,7 +148,6 @@ in
       imports = [ ../../3modules/krebs/retiolum.nix ];
       krebs.retiolum = {
         enable = true;
-        hosts = ../../Zhosts;
         connectTo = [
           "gum"
           "pigstarter"
-- 
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/cd.nix    | 12 ------------
 1systems/tv/mkdir.nix |  2 --
 1systems/tv/nomic.nix |  3 ---
 1systems/tv/rmdir.nix |  2 --
 1systems/tv/wu.nix    |  6 +-----
 5 files changed, 1 insertion(+), 24 deletions(-)

(limited to '1systems/tv')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index bf556e0..b15b189 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -22,14 +22,12 @@ in
       };
     }
     {
-      imports = [ ../../3modules/tv/ejabberd.nix ];
       tv.ejabberd = {
         enable = true;
         hosts = [ "jabber.viljetic.de" ];
       };
     }
     {
-      imports = [ ../../3modules/krebs/github-hosts-sync.nix ];
       krebs.github-hosts-sync.enable = true;
       tv.iptables.input-internet-accept-new-tcp =
         singleton config.krebs.github-hosts-sync.port;
@@ -39,7 +37,6 @@ in
       tv.identity.self = config.tv.identity.hosts.cd;
     }
     {
-      imports = [ ../../3modules/tv/iptables.nix ];
       tv.iptables = {
         enable = true;
         input-internet-accept-new-tcp = [
@@ -55,19 +52,11 @@ in
       };
     }
     {
-      imports = [
-        ../../3modules/tv/iptables.nix
-        ../../3modules/krebs/nginx.nix
-      ];
       tv.iptables.input-internet-accept-new-tcp = singleton "http";
       krebs.nginx.servers.cgit.server-names = singleton "cgit.cd.viljetic.de";
     }
     {
       # TODO make public_html also available to cd, cd.retiolum (AKA default)
-      imports = [
-        ../../3modules/tv/iptables.nix
-        ../../3modules/krebs/nginx.nix
-      ];
       tv.iptables.input-internet-accept-new-tcp = singleton "http";
       krebs.nginx.servers.public_html = {
         server-names = singleton "cd.viljetic.de";
@@ -86,7 +75,6 @@ in
       };
     }
     {
-      imports = [ ../../3modules/krebs/retiolum.nix ];
       krebs.retiolum = {
         enable = true;
         connectTo = [
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 = [
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index ef4a5ca..367502e 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -14,7 +14,6 @@ with lib;
       tv.identity.self = config.tv.identity.hosts.nomic;
     }
     {
-      imports = [ ../../3modules/tv/iptables.nix ];
       tv.iptables = {
         enable = true;
         input-internet-accept-new-tcp = [
@@ -26,7 +25,6 @@ with lib;
       };
     }
     {
-      imports = [ ../../3modules/krebs/nginx.nix ];
       krebs.nginx = {
         enable = true;
         servers.default.locations = [
@@ -37,7 +35,6 @@ with lib;
       };
     }
     {
-      imports = [ ../../3modules/krebs/retiolum.nix ];
       krebs.retiolum = {
         enable = true;
         connectTo = [
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index f15c790..497354e 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.nix
@@ -15,7 +15,6 @@ with lib;
       tv.identity.self = config.tv.identity.hosts.rmdir;
     }
     {
-      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 = [
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 0b5b828..8470a4f 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -24,7 +24,7 @@ in
     {
       environment.systemPackages = with pkgs; [
 
-        # shitment
+        # stockholm
         git
         gnumake
         parallel
@@ -122,7 +122,6 @@ in
       ];
     }
     {
-      imports = [ ../../3modules/tv/iptables.nix ];
       tv.iptables = {
         enable = true;
         input-internet-accept-new-tcp = [
@@ -134,7 +133,6 @@ in
       };
     }
     {
-      imports = [ ../../3modules/krebs/nginx.nix ];
       krebs.nginx = {
         enable = true;
         servers.default.locations = [
@@ -145,7 +143,6 @@ in
       };
     }
     {
-      imports = [ ../../3modules/krebs/retiolum.nix ];
       krebs.retiolum = {
         enable = true;
         connectTo = [
@@ -155,7 +152,6 @@ in
       };
     }
     {
-      imports = [ ../../3modules/krebs/urlwatch.nix ];
       krebs.urlwatch = {
         enable = true;
         mailto = "tv@wu.retiolum"; # TODO
-- 
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/cd.nix    | 2 +-
 1systems/tv/mkdir.nix | 2 +-
 1systems/tv/nomic.nix | 2 +-
 1systems/tv/rmdir.nix | 2 +-
 1systems/tv/wu.nix    | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

(limited to '1systems/tv')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index b15b189..d30e7ed 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -13,7 +13,7 @@ in
     ../../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/charybdis.nix ];
       tv.charybdis = {
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;
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index 367502e..2d32d9e 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -8,7 +8,7 @@ with lib;
     ../../2configs/tv/base.nix
     ../../2configs/tv/consul-server.nix
     ../../2configs/tv/exim-retiolum.nix
-    ../../2configs/tv/git-public.nix
+    ../../2configs/tv/git.nix
     {
       imports = [ ../../2configs/tv/identity.nix ];
       tv.identity.self = config.tv.identity.hosts.nomic;
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index 497354e..c470086 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.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.rmdir;
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 8470a4f..234b805 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -12,8 +12,7 @@ in
     ../../2configs/tv/base.nix
     ../../2configs/tv/consul-client.nix
     ../../2configs/tv/exim-retiolum.nix
-    ../../2configs/tv/git-public.nix
-    # TODO git-private.nix
+    ../../2configs/tv/git.nix
     ../../2configs/tv/mail-client.nix
     ../../2configs/tv/xserver.nix
     ../../2configs/tv/synaptics.nix # TODO w110er if xserver is enabled
-- 
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/cd.nix    | 2 +-
 1systems/tv/mkdir.nix | 2 +-
 1systems/tv/nomic.nix | 2 +-
 1systems/tv/rmdir.nix | 2 +-
 1systems/tv/wu.nix    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to '1systems/tv')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index d30e7ed..c0c41e9 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -34,7 +34,7 @@ in
     }
     {
       imports = [ ../../2configs/tv/identity.nix ];
-      tv.identity.self = config.tv.identity.hosts.cd;
+      tv.identity.self = config.krebs.hosts.cd;
     }
     {
       tv.iptables = {
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 = {
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index 2d32d9e..fc58c16 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -11,7 +11,7 @@ with lib;
     ../../2configs/tv/git.nix
     {
       imports = [ ../../2configs/tv/identity.nix ];
-      tv.identity.self = config.tv.identity.hosts.nomic;
+      tv.identity.self = config.krebs.hosts.nomic;
     }
     {
       tv.iptables = {
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index c470086..15d624d 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.nix
@@ -12,7 +12,7 @@ with lib;
     ../../2configs/tv/git.nix
     {
       imports = [ ../../2configs/tv/identity.nix ];
-      tv.identity.self = config.tv.identity.hosts.rmdir;
+      tv.identity.self = config.krebs.hosts.rmdir;
     }
     {
       tv.iptables = {
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 234b805..4a74d55 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -18,7 +18,7 @@ in
     ../../2configs/tv/synaptics.nix # TODO w110er if xserver is enabled
     {
       imports = [ ../../2configs/tv/identity.nix ];
-      tv.identity.self = config.tv.identity.hosts.wu;
+      tv.identity.self = config.krebs.hosts.wu;
     }
     {
       environment.systemPackages = with pkgs; [
-- 
cgit v1.2.3


From 5dbfb4277c61d0339f688797ca4655056d58ee22 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 24 Jul 2015 23:18:12 +0200
Subject: 1 tv wu: systemPackages += hashPassword

---
 1systems/tv/wu.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to '1systems/tv')

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 4a74d55..5ca64ce 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -28,6 +28,7 @@ in
         gnumake
         parallel
         Zpkgs.genid
+        Zpkgs.hashPassword
         Zpkgs.lentil
 
         # root
-- 
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/cd.nix    | 6 ++----
 1systems/tv/mkdir.nix | 6 ++----
 1systems/tv/nomic.nix | 6 ++----
 1systems/tv/rmdir.nix | 6 ++----
 1systems/tv/wu.nix    | 6 ++----
 5 files changed, 10 insertions(+), 20 deletions(-)

(limited to '1systems/tv')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index c0c41e9..4b8c40f 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;
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;
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index fc58c16..1f7f6b1 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -3,16 +3,14 @@
 with lib;
 
 {
+  krebs.build.host = config.krebs.hosts.nomic;
+
   imports = [
     ../../2configs/tv/AO753.nix
     ../../2configs/tv/base.nix
     ../../2configs/tv/consul-server.nix
     ../../2configs/tv/exim-retiolum.nix
     ../../2configs/tv/git.nix
-    {
-      imports = [ ../../2configs/tv/identity.nix ];
-      tv.identity.self = config.krebs.hosts.nomic;
-    }
     {
       tv.iptables = {
         enable = true;
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index 15d624d..45e9997 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.nix
@@ -3,6 +3,8 @@
 with lib;
 
 {
+  krebs.build.host = config.krebs.hosts.rmdir;
+
   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.rmdir;
-    }
     {
       tv.iptables = {
         enable = true;
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 5ca64ce..0b2dab9 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -7,6 +7,8 @@ let
 in
 
 {
+  krebs.build.host = config.krebs.hosts.wu;
+
   imports = [
     ../../2configs/tv/w110er.nix
     ../../2configs/tv/base.nix
@@ -16,10 +18,6 @@ in
     ../../2configs/tv/mail-client.nix
     ../../2configs/tv/xserver.nix
     ../../2configs/tv/synaptics.nix # TODO w110er if xserver is enabled
-    {
-      imports = [ ../../2configs/tv/identity.nix ];
-      tv.identity.self = config.krebs.hosts.wu;
-    }
     {
       environment.systemPackages = with pkgs; [
 
-- 
cgit v1.2.3


From 5ef409768b25185d7fef7f1fb9096d89ff16c6e4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.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')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index 4b8c40f..fcaf19c 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 1a753d75642f8dc4c45f4c74fa5213d7e1da01c0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 25 Jul 2015 01:06:13 +0200
Subject: krebs.users.[mt]v: set mail

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

(limited to '1systems/tv')

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 0b2dab9..ccb2dd1 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -152,7 +152,7 @@ in
     {
       krebs.urlwatch = {
         enable = true;
-        mailto = "tv@wu.retiolum"; # TODO
+        mailto = config.krebs.users.tv.mail;
         onCalendar = "*-*-* 05:00:00";
         urls = [
           ## nixpkgs maintenance
-- 
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/cd.nix    | 1 -
 1systems/tv/mkdir.nix | 1 -
 1systems/tv/nomic.nix | 2 --
 1systems/tv/rmdir.nix | 1 -
 1systems/tv/wu.nix    | 2 --
 5 files changed, 7 deletions(-)

(limited to '1systems/tv')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index fcaf19c..6913508 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";
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
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index 1f7f6b1..cd6e025 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -97,6 +97,4 @@ with lib;
     rxvt_unicode.terminfo
     tmux
   ];
-
-  networking.hostName = "nomic";
 }
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index 45e9997..9233014 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.nix
@@ -39,7 +39,6 @@ with lib;
     }
   ];
 
-  networking.hostName = "rmdir";
   networking.interfaces.enp2s1.ip4 = [
     {
       address = "167.88.44.94";
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index ccb2dd1..809f43c 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -422,8 +422,6 @@ in
   hardware.opengl.driSupport32Bit = true;
   hardware.pulseaudio.enable = true;
 
-  networking.hostName = "wu";
-
   environment.systemPackages = with pkgs; [
     xlibs.fontschumachermisc
     slock
-- 
cgit v1.2.3


From 726661bc94926397064a6117ed577f2362a4ceb7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 25 Jul 2015 01:46:10 +0200
Subject: {1 tv wu -> 2 tv} urlwatch

---
 1systems/tv/wu.nix | 51 +--------------------------------------------------
 1 file changed, 1 insertion(+), 50 deletions(-)

(limited to '1systems/tv')

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 809f43c..3726463 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -18,6 +18,7 @@ in
     ../../2configs/tv/mail-client.nix
     ../../2configs/tv/xserver.nix
     ../../2configs/tv/synaptics.nix # TODO w110er if xserver is enabled
+    ../../2configs/tv/urlwatch.nix
     {
       environment.systemPackages = with pkgs; [
 
@@ -94,7 +95,6 @@ in
         #ppp
         #proot
         #pythonPackages.arandr
-        #pythonPackages.urlwatch
         #pythonPackages.youtube-dl
         #racket
         #rxvt_unicode-with-plugins
@@ -149,55 +149,6 @@ in
         ];
       };
     }
-    {
-      krebs.urlwatch = {
-        enable = true;
-        mailto = config.krebs.users.tv.mail;
-        onCalendar = "*-*-* 05:00:00";
-        urls = [
-          ## nixpkgs maintenance
-
-          # 2014-07-29 when one of the following urls change
-          # then we have to update the package
-
-          # ref src/nixpkgs/pkgs/tools/admin/sec/default.nix
-          https://api.github.com/repos/simple-evcorr/sec/tags
-
-          # ref src/nixpkgs/pkgs/tools/networking/urlwatch/default.nix
-          https://thp.io/2008/urlwatch/
-
-          # 2014-12-20 ref src/nixpkgs/pkgs/tools/networking/tlsdate/default.nix
-          https://api.github.com/repos/ioerror/tlsdate/tags
-
-          # 2015-02-18
-          # ref ~/src/nixpkgs/pkgs/tools/text/qprint/default.nix
-          http://www.fourmilab.ch/webtools/qprint/
-
-          # 2014-09-24 ref https://github.com/4z3/xintmap
-          http://www.mathstat.dal.ca/~selinger/quipper/
-
-          # 2014-12-12 remove nixopsUnstable when nixops get's bumped to 1.3
-          # ref https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/package-management/nixops/unstable.nix
-          http://nixos.org/releases/nixops/
-
-          ## other
-
-          https://nixos.org/channels/nixos-unstable/git-revision
-
-          ## 2014-10-17
-          ## TODO update ~/src/login/default.nix
-          #http://hackage.haskell.org/package/bcrypt
-          #http://hackage.haskell.org/package/cron
-          #http://hackage.haskell.org/package/hyphenation
-          #http://hackage.haskell.org/package/iso8601-time
-          #http://hackage.haskell.org/package/ixset-typed
-          #http://hackage.haskell.org/package/system-command
-          #http://hackage.haskell.org/package/transformers
-          #http://hackage.haskell.org/package/web-routes-wai
-          #http://hackage.haskell.org/package/web-page
-        ];
-      };
-    }
     {
       users.extraGroups = {
         tv-sub.gid = 1337;
-- 
cgit v1.2.3