From 734ec4ae00c93d48297b7c3ee226ef890187bfa3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.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')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index d3cae6f4a..407fc25cf 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 6f984c44d..8e6812e43 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 76bb43eca..7a12bc571 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 b6987329fe6dca5aca96fc651f06867c26dbf236 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.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')

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 7a12bc571..1d7bbe55b 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 e3b72bb66e7c6bf410c8db81ff04e355a7b22116 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.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')

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index 407fc25cf..463d643a6 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