From ffc8db4f03b7c714c6177abd6d832c4859f68409 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Thu, 11 Apr 2024 21:30:26 +0200
Subject: [PATCH] move to kubernetes DNS

---
 .../networking/dmz_services/default.nix       | 29 +------------------
 .../networking/dmz_services/dnsmasq.nix       |  7 +----
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/nix/modules/networking/dmz_services/default.nix b/nix/modules/networking/dmz_services/default.nix
index f0b8223..b81c32a 100644
--- a/nix/modules/networking/dmz_services/default.nix
+++ b/nix/modules/networking/dmz_services/default.nix
@@ -1,13 +1,6 @@
-# TODO: we should split this into DHCP and DNS
-# This decoupling makes it easier to put one service on another host.
-{ pkgs, lib, config, dns, ... }@inputs:
+{ lib, config, ... }@inputs:
 let
   cfg = config.lab.networking.dmz.services;
-
-  kunisZoneFile = pkgs.writeTextFile {
-    name = "kunis-zone-file";
-    text = (dns.lib.toString "kun.is" (import ./zones/kun.is.nix inputs));
-  };
 in
 {
   options.lab.networking.dmz.services.enable = lib.mkOption {
@@ -29,26 +22,6 @@ in
     };
 
     services = {
-      bind = {
-        enable = true;
-        forwarders = [ ];
-
-        extraOptions = ''
-          allow-transfer { none; };
-          allow-recursion { none; };
-          version none;
-          notify no;
-        '';
-
-        zones = {
-          "kun.is" = {
-            master = true;
-            file = kunisZoneFile;
-            allowQuery = [ "any" ];
-          };
-        };
-      };
-
       dnsmasq = {
         enable = true;
         settings = import ./dnsmasq.nix inputs;
diff --git a/nix/modules/networking/dmz_services/dnsmasq.nix b/nix/modules/networking/dmz_services/dnsmasq.nix
index a000a6a..124d247 100644
--- a/nix/modules/networking/dmz_services/dnsmasq.nix
+++ b/nix/modules/networking/dmz_services/dnsmasq.nix
@@ -17,13 +17,11 @@ in
   port = "5353";
   host-record = [
     "hermes.dmz,${cfg.dmz.ipv4.services},${cfg.dmz.ipv6.services}"
-    "ipv4.hermes.dmz,${cfg.dmz.ipv4.services}" # TODO: Do we need these?
-    "ipv6.hermes.dmz,${cfg.dmz.ipv6.services}"
   ];
 
   server = [
     cfg.dmz.ipv4.router
-    "/kun.is/${cfg.dmz.ipv4.services}"
+    "/kun.is/192.168.30.134"
   ];
 
   dhcp-range = [
@@ -33,7 +31,6 @@ in
 
   dhcp-host = [
     "b8:27:eb:b9:ab:e2,esrom"
-    "ba:db:ee:f0:00:01,maestro,${cfg.dmz.ipv4.dockerSwarm}"
   ];
 
   dhcp-option = [
@@ -43,8 +40,6 @@ in
   ];
 
   address = [
-    "/ns.pizzapim.nl/${cfg.dmz.ipv4.services}"
-    "/ns.pizzapim.nl/${cfg.dmz.ipv6.services}"
     "/kms.kun.is/192.168.30.129"
     "/ssh.git.kun.is/192.168.30.132"
   ];