Merge branch 'master' of http://cgit.cd/stockholm

3 files changed, 14 insertions, 14 deletions

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index d3cae6f4..463d643a 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 ];
@@ -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 6f984c44..8e6812e4 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 76bb43ec..1d7bbe55 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 "~ ^/~(.+?)(/.*)?\$" ''
@@ -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";