From 734ec4ae00c93d48297b7c3ee226ef890187bfa3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 24 Jul 2015 11:50:23 +0200
Subject: [PATCH] 3 {tv -> krebs}.nginx

---
 1systems/tv/cd.nix               | 10 +++++-----
 1systems/tv/nomic.nix            |  4 ++--
 1systems/tv/wu.nix               |  4 ++--
 3modules/{tv => krebs}/nginx.nix |  7 ++++---
 3modules/tv/git.nix              |  5 +++--
 5 files changed, 16 insertions(+), 14 deletions(-)
 rename 3modules/{tv => krebs}/nginx.nix (91%)

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 "~ ^/~(.+?)(/.*)?\$" ''
diff --git a/3modules/tv/nginx.nix b/3modules/krebs/nginx.nix
similarity index 91%
rename from 3modules/tv/nginx.nix
rename to 3modules/krebs/nginx.nix
index a58c49520..702e8a7f6 100644
--- a/3modules/tv/nginx.nix
+++ b/3modules/krebs/nginx.nix
@@ -3,21 +3,22 @@
 with builtins;
 with lib;
 let
-  cfg = config.tv.nginx;
+  cfg = config.krebs.nginx;
 
   out = {
-    options.tv.nginx = api;
+    options.krebs.nginx = api;
     config = mkIf cfg.enable imp;
   };
 
   api = {
-    enable = mkEnableOption "tv.nginx";
+    enable = mkEnableOption "krebs.nginx";
 
     servers = mkOption {
       type = with types; attrsOf optionSet;
       options = singleton {
         server-names = mkOption {
           type = with types; listOf str;
+          # TODO use identity
           default = [
             "${config.networking.hostName}"
             "${config.networking.hostName}.retiolum"
diff --git a/3modules/tv/git.nix b/3modules/tv/git.nix
index 8c73d0354..ea014e2a7 100644
--- a/3modules/tv/git.nix
+++ b/3modules/tv/git.nix
@@ -12,8 +12,9 @@ let
   cfg = config.tv.git;
 
   out = {
+    # TODO don't import krebs.nginx here
     imports = [
-      ../../3modules/tv/nginx.nix
+      ../../3modules/krebs/nginx.nix
     ];
     options.tv.git = api;
     config = mkIf cfg.enable (mkMerge [
@@ -210,7 +211,7 @@ let
       chown ${toString fcgitwrap-user.uid}:${toString fcgitwrap-group.gid} /tmp/cgit
     '';
 
-    tv.nginx = {
+    krebs.nginx = {
       enable = true;
       servers.cgit = {
         server-names = [