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

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

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

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 1d7bbe55..c5678a19 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 faf5f6c172d6a6915e18cdec85e3543051eb0449 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 24 Jul 2015 12:41:41 +0200
Subject: krebs.retiolum: define type of hosts

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

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

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index c5678a19..0b5b8289 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 f1ebbc73395e733e222b7f51e3fb554579ec1916 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 24 Jul 2015 17:34:08 +0200
Subject: autoimport 3*/{krebs,$(LOGNAME)}

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

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

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 0b5b8289..8470a4f2 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 54becaa19fcbc11ac709ddaf86e56ee3b736931d Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 24 Jul 2015 19:33:20 +0200
Subject: tv git: add restricted repos

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

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

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 8470a4f2..234b8055 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