4 files changed, 29 insertions, 152 deletions
diff --git a/tv/1systems/caxi.nix b/tv/1systems/caxi.nix
new file mode 100644
index 000000000..5bfacd992
--- /dev/null
+++ b/tv/1systems/caxi.nix
@@ -0,0 +1,25 @@
+{ config, ... }:
+
+with config.krebs.lib;
+
+{
+  krebs.build.host = config.krebs.hosts.caxi;
+
+  imports = [
+    ../.
+    ../2configs/hw/CAC-Developer-1.nix
+    ../2configs/fs/CAC-CentOS-7-64bit.nix
+    ../2configs/retiolum.nix
+  ];
+
+  networking = let
+    inherit (config.krebs.build.host.nets.internet) ip4;
+  in {
+    interfaces.enp2s1.ip4 = singleton {
+      address = ip4.addr;
+      prefixLength = fromJSON (head (match ".*/([0-9]+)" ip4.prefix));
+    };
+    defaultGateway = head (match "([^/]*)\.0/[0-9]+" ip4.prefix) + ".1";
+    nameservers = ["8.8.8.8"];
+  };
+}
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
deleted file mode 100644
index dcec1e200..000000000
--- a/tv/1systems/mkdir.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with config.krebs.lib;
-
-let
-  # TODO merge with lass
-  getDefaultGateway = ip:
-    concatStringsSep "." (take 3 (splitString "." ip) ++ ["1"]);
-
-  primary-addr4 = config.krebs.build.host.nets.internet.ip4.addr;
-in
-
-{
-  krebs.build.host = config.krebs.hosts.mkdir;
-
-  imports = [
-    ../.
-    ../2configs/hw/CAC-Developer-1.nix
-    ../2configs/fs/CAC-CentOS-7-64bit.nix
-    ../2configs/exim-smarthost.nix
-    ../2configs/git.nix
-    {
-      tv.iptables = {
-        enable = true;
-        input-internet-accept-tcp = [
-          "ssh"
-          "tinc"
-          "smtp"
-        ];
-        input-retiolum-accept-tcp = [
-          "http"
-        ];
-      };
-    }
-    {
-      krebs.retiolum = {
-        enable = true;
-        connectTo = [
-          "cd"
-          "fastpoke"
-          "pigstarter"
-          "ire"
-        ];
-      };
-    }
-  ];
-
-  networking.interfaces.enp2s1.ip4 = [
-    {
-      address = primary-addr4;
-      prefixLength = 24;
-    }
-  ];
-
-  # TODO define gateway in krebs/3modules/default.nix
-  networking.defaultGateway = getDefaultGateway primary-addr4;
-
-  networking.nameservers = [
-    "8.8.8.8"
-  ];
-
-  environment.systemPackages = with pkgs; [
-    htop
-    iftop
-    iotop
-    iptables
-    nethogs
-    rxvt_unicode.terminfo
-    tcpdump
-  ];
-
-  services.journald.extraConfig = ''
-    SystemMaxUse=1G
-    RuntimeMaxUse=128M
-  '';
-}
diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix
deleted file mode 100644
index 34f926020..000000000
--- a/tv/1systems/rmdir.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with config.krebs.lib;
-
-let
-  # TODO merge with lass
-  getDefaultGateway = ip:
-    concatStringsSep "." (take 3 (splitString "." ip) ++ ["1"]);
-
-  primary-addr4 = config.krebs.build.host.nets.internet.ip4.addr;
-in
-
-{
-  krebs.build.host = config.krebs.hosts.rmdir;
-
-  imports = [
-    ../.
-    ../2configs/hw/CAC-Developer-1.nix
-    ../2configs/fs/CAC-CentOS-7-64bit.nix
-    ../2configs/exim-smarthost.nix
-    ../2configs/git.nix
-    {
-      tv.iptables = {
-        enable = true;
-        input-internet-accept-tcp = [
-          "ssh"
-          "tinc"
-          "smtp"
-        ];
-        input-retiolum-accept-tcp = [
-          "http"
-        ];
-      };
-    }
-    {
-      krebs.retiolum = {
-        enable = true;
-        connectTo = [
-          "cd"
-          "mkdir"
-          "fastpoke"
-          "pigstarter"
-          "ire"
-        ];
-      };
-    }
-  ];
-
-  networking.interfaces.enp2s1.ip4 = [
-    {
-      address = primary-addr4;
-      prefixLength = 24;
-    }
-  ];
-  # TODO define gateway in krebs/3modules/default.nix
-  networking.defaultGateway = getDefaultGateway primary-addr4;
-
-  networking.nameservers = [
-    "8.8.8.8"
-  ];
-
-  environment.systemPackages = with pkgs; [
-    htop
-    iftop
-    iotop
-    iptables
-    nethogs
-    rxvt_unicode.terminfo
-    tcpdump
-  ];
-
-  services.journald.extraConfig = ''
-    SystemMaxUse=1G
-    RuntimeMaxUse=128M
-  '';
-}
diff --git a/tv/2configs/nginx/default.nix b/tv/2configs/nginx/default.nix
index d0d07d5ca..70e25e2e5 100644
--- a/tv/2configs/nginx/default.nix
+++ b/tv/2configs/nginx/default.nix
@@ -4,6 +4,10 @@ with config.krebs.lib;
 
 {
   krebs.nginx = {
+    extraConfig = ''
+      events {
+      }
+    '';
     servers.default.locations = [
       (nameValuePair "= /etc/os-release" ''
         default_type text/plain;