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

---
 3modules/tv/git.nix   |  5 ++--
 3modules/tv/nginx.nix | 71 ---------------------------------------------------
 2 files changed, 3 insertions(+), 73 deletions(-)
 delete mode 100644 3modules/tv/nginx.nix

(limited to '3modules/tv')

diff --git a/3modules/tv/git.nix b/3modules/tv/git.nix
index 8c73d035..ea014e2a 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 = [
diff --git a/3modules/tv/nginx.nix b/3modules/tv/nginx.nix
deleted file mode 100644
index a58c4952..00000000
--- a/3modules/tv/nginx.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with builtins;
-with lib;
-let
-  cfg = config.tv.nginx;
-
-  out = {
-    options.tv.nginx = api;
-    config = mkIf cfg.enable imp;
-  };
-
-  api = {
-    enable = mkEnableOption "tv.nginx";
-
-    servers = mkOption {
-      type = with types; attrsOf optionSet;
-      options = singleton {
-        server-names = mkOption {
-          type = with types; listOf str;
-          default = [
-            "${config.networking.hostName}"
-            "${config.networking.hostName}.retiolum"
-          ];
-        };
-        locations = mkOption {
-          type = with types; listOf (attrsOf str);
-        };
-      };
-      default = {};
-    };
-  };
-
-  imp = {
-    services.nginx = {
-      enable = true;
-      httpConfig = ''
-        include           ${pkgs.nginx}/conf/mime.types;
-        default_type      application/octet-stream;
-        sendfile          on;
-        keepalive_timeout 65;
-        gzip              on;
-        server {
-          listen 80 default_server;
-          server_name _;
-          return 404;
-        }
-        ${concatStrings (mapAttrsToList (_: to-server) cfg.servers)}
-      '';
-    };
-  };
-
-  
-  indent = replaceChars ["\n"] ["\n  "];
-
-  to-location = { name, value }: ''
-    location ${name} {
-      ${indent value}
-    }
-  '';
-
-  to-server = { server-names, locations, ... }: ''
-    server {
-      listen 80;
-      server_name ${toString server-names};
-      ${indent (concatStrings (map to-location locations))}
-    }
-  '';
-
-in
-out
-- 
cgit v1.2.3