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 ++--
 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 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 = [
-- 
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 -
 1 file changed, 1 deletion(-)

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

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"
-- 
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 ------------
 1 file changed, 12 deletions(-)

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

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 = [
-- 
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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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 = {
-- 
cgit v1.2.3