From 85816b60c2002ea3ea68e51523b9fc2490f0a8e5 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2023 14:06:03 +0200
Subject: zones: import misplaced options from ssh

---
 krebs/3modules/zones.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'krebs/3modules/zones.nix')

diff --git a/krebs/3modules/zones.nix b/krebs/3modules/zones.nix
index 7771d3b51..a7bd867f5 100644
--- a/krebs/3modules/zones.nix
+++ b/krebs/3modules/zones.nix
@@ -1,6 +1,22 @@
 { config, pkgs, lib, ... }:
 with lib; {
 
+  options.krebs.zone-head-config = mkOption {
+    type = lib.types.attrsOf lib.types.str;
+    description = ''
+      The zone configuration head which is being used to create the
+      zone files. The string for each key is pre-pended to the zone file.
+    '';
+    default = {
+      "krebsco.de" = /* bindzone */ ''
+        $TTL 86400
+        @ IN SOA dns19.ovh.net. tech.ovh.net. (2015052000 86400 3600 3600000 86400)
+        @ IN NS ns19.ovh.net.
+        @ IN NS dns19.ovh.net.
+      '';
+    };
+  };
+
   config = {
     environment.etc =
       mapAttrs'
-- 
cgit v1.2.3


From b63f7920b5bce1670692e6278eb87db52b1ba0af Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2023 17:27:09 +0200
Subject: zones: update default head config

---
 krebs/3modules/zones.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'krebs/3modules/zones.nix')

diff --git a/krebs/3modules/zones.nix b/krebs/3modules/zones.nix
index a7bd867f5..1d63548b8 100644
--- a/krebs/3modules/zones.nix
+++ b/krebs/3modules/zones.nix
@@ -9,10 +9,9 @@ with lib; {
     '';
     default = {
       "krebsco.de" = /* bindzone */ ''
-        $TTL 86400
-        @ IN SOA dns19.ovh.net. tech.ovh.net. (2015052000 86400 3600 3600000 86400)
-        @ IN NS ns19.ovh.net.
-        @ IN NS dns19.ovh.net.
+        $TTL 60
+        @ 3600 IN SOA spam.krebsco.de. spam.krebsco.de. 0 7200 3600 86400 3600
+        @ 3600 IN NS ns1
       '';
     };
   };
-- 
cgit v1.2.3


From 7cd50a3c07e788fa0b4ab53c78b9dea10ff30b2d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Aug 2023 11:39:33 +0200
Subject: nameserver config: add ni as secondary

---
 krebs/3modules/zones.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/3modules/zones.nix')

diff --git a/krebs/3modules/zones.nix b/krebs/3modules/zones.nix
index 1d63548b8..bf904a268 100644
--- a/krebs/3modules/zones.nix
+++ b/krebs/3modules/zones.nix
@@ -12,6 +12,7 @@ with lib; {
         $TTL 60
         @ 3600 IN SOA spam.krebsco.de. spam.krebsco.de. 0 7200 3600 86400 3600
         @ 3600 IN NS ns1
+        @ 3600 IN NS ni
       '';
     };
   };
-- 
cgit v1.2.3


From 193baa8f2f64a4909e38069d4f21ac6c46d2796b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Aug 2023 15:53:27 +0200
Subject: nameserver config: add he.net as secondary

---
 krebs/3modules/zones.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'krebs/3modules/zones.nix')

diff --git a/krebs/3modules/zones.nix b/krebs/3modules/zones.nix
index bf904a268..8cb68c4f7 100644
--- a/krebs/3modules/zones.nix
+++ b/krebs/3modules/zones.nix
@@ -13,6 +13,8 @@ with lib; {
         @ 3600 IN SOA spam.krebsco.de. spam.krebsco.de. 0 7200 3600 86400 3600
         @ 3600 IN NS ns1
         @ 3600 IN NS ni
+        @ 3600 IN NS ns2.he.net.
+        @ 3600 IN NS ns3.he.net.
       '';
     };
   };
-- 
cgit v1.2.3


From 7e98588f8e626c4e2800e1238ea8a1df1f5c8f7a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Aug 2023 17:42:32 +0200
Subject: nameserver config: add hosting.de as secondary

---
 krebs/3modules/zones.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/3modules/zones.nix')

diff --git a/krebs/3modules/zones.nix b/krebs/3modules/zones.nix
index 8cb68c4f7..e68482d77 100644
--- a/krebs/3modules/zones.nix
+++ b/krebs/3modules/zones.nix
@@ -15,6 +15,7 @@ with lib; {
         @ 3600 IN NS ni
         @ 3600 IN NS ns2.he.net.
         @ 3600 IN NS ns3.he.net.
+        @ 3600 IN NS ns2.hosting.de.
       '';
     };
   };
-- 
cgit v1.2.3