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

4 files changed, 17 insertions, 15 deletions

diff --git a/3modules/tv/git.nix b/3modules/krebs/git.nix
index 8c73d035..3c3e9342 100644
--- a/3modules/tv/git.nix
+++ b/3modules/krebs/git.nix
@@ -9,13 +9,14 @@
 with builtins;
 with lib;
 let
-  cfg = config.tv.git;
+  cfg = config.krebs.git;
 
   out = {
+    # TODO don't import krebs.nginx here
     imports = [
-      ../../3modules/tv/nginx.nix
+      ../../3modules/krebs/nginx.nix
     ];
-    options.tv.git = api;
+    options.krebs.git = api;
     config = mkIf cfg.enable (mkMerge [
       (mkIf cfg.cgit cgit-imp)
       git-imp
@@ -23,7 +24,7 @@ let
   };
 
   api = {
-    enable = mkEnableOption "tv.git";
+    enable = mkEnableOption "krebs.git";
 
     cgit = mkOption {
       type = types.bool;
@@ -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 = [
diff --git a/3modules/tv/github-hosts-sync.nix b/3modules/krebs/github-hosts-sync.nix
index f50bf2b1..c3b56ef9 100644
--- a/3modules/tv/github-hosts-sync.nix
+++ b/3modules/krebs/github-hosts-sync.nix
@@ -3,15 +3,15 @@
 with builtins;
 with lib;
 let
-  cfg = config.tv.github-hosts-sync;
+  cfg = config.krebs.github-hosts-sync;
 
   out = {
-    options.tv.github-hosts-sync = api;
+    options.krebs.github-hosts-sync = api;
     config = mkIf cfg.enable imp;
   };
 
   api = {
-    enable = mkEnableOption "tv.github-hosts-sync";
+    enable = mkEnableOption "krebs.github-hosts-sync";
     port = mkOption {
       type = types.int; # TODO port type
       default = 1028;
@@ -78,6 +78,6 @@ let
     uid = 3220554646; # genid github-hosts-sync
   };
 
-  Zpkgs = import ../../Zpkgs/tv { inherit pkgs; };
+  Zpkgs = import ../../Zpkgs/krebs { inherit pkgs; };
 in
 out
diff --git a/3modules/tv/nginx.nix b/3modules/krebs/nginx.nix
index a58c4952..702e8a7f 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/urlwatch.nix b/3modules/krebs/urlwatch.nix
index a659fc74..58de72fc 100644
--- a/3modules/tv/urlwatch.nix
+++ b/3modules/krebs/urlwatch.nix
@@ -8,16 +8,16 @@
 with builtins;
 with lib;
 let
-  cfg = config.tv.urlwatch;
+  cfg = config.krebs.urlwatch;
 
   # TODO assert sendmail's existence
   out = {
-    options.tv.urlwatch = api;
+    options.krebs.urlwatch = api;
     config = mkIf cfg.enable imp;
   };
 
   api = {
-    enable = mkEnableOption "tv.urlwatch";
+    enable = mkEnableOption "krebs.urlwatch";
 
     dataDir = mkOption {
       type = types.str;