From 2a949f8e8211cb8ff6029af493cb4d4fc49a9de9 Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Sat, 20 Jul 2024 00:51:24 +0100
Subject: [PATCH] fix: test the new format

---
 applications/dns/dns.nix |  8 ++++----
 config/dns.nix           | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix
index ec32461..155cfea 100644
--- a/applications/dns/dns.nix
+++ b/applications/dns/dns.nix
@@ -9,7 +9,7 @@
   cfg = config.services.skynet."${name}";
 
   # reads that date to a string (will need to be fixed in 2038)
-  current_date = lib.readFile "${pkgs.runCommand "timestamp" {} "echo -n `date +%s` > $out"}";
+  current_date = builtins.currentTime;
 
   # this gets a list of all domains we have records for
   domains = lib.lists.naturalSort (
@@ -79,7 +79,7 @@
       ; hostmaster@skynet.ie is an email address that recieves stuff related to dns
       @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. (
          ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
-         ${current_date}
+         ${toString current_date}
          600        ; Refresh (10 minutes)
          300        ; Retry   (5 minutes)
          604800     ; Expire  (1 week)
@@ -133,7 +133,7 @@
       ; hostmaster@skynet.ie is an email address that recieves stuff related to dns
       @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. (
          ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
-         ${current_date}
+         ${toString current_date}
          600        ; Refresh (10 minutes)
          300        ; Retry   (5 minutes)
          604800     ; Expire  (1 week)
@@ -215,7 +215,7 @@
       extraConfig = ''
         ${if_primary_and_owned}
         // for bumping the config
-        // ${current_date}
+        // ${toString current_date}
       '';
       # really wish teh nixos config didnt use master/slave
       master = cfg.server.primary;
diff --git a/config/dns.nix b/config/dns.nix
index 08eeb4c..f4b0119 100644
--- a/config/dns.nix
+++ b/config/dns.nix
@@ -37,7 +37,7 @@
         {
           record = "_minecraft._tcp.minecraft.compsoc.games.skynet.ie.";
           r_type = "SRV";
-          value = "0 10 25518 minecraft.compsoc.games.skynet.ie.";
+          value = "0 10 25518 bumblebee.skynet.ie.";
         }
         {
           record = "minecraft-classic.compsoc.games";
@@ -47,7 +47,7 @@
         {
           record = "_minecraft._tcp.minecraft-classic.compsoc.games.skynet.ie.";
           r_type = "SRV";
-          value = "0 10 25518 minecraft-classic.compsoc.games.skynet.ie.";
+          value = "0 10 25518 bumblebee.skynet.ie.";
         }
         {
           record = "minecraft.gsoc.games";
@@ -57,7 +57,7 @@
         {
           record = "_minecraft._tcp.minecraft.gsoc.games.skynet.ie.";
           r_type = "SRV";
-          value = "0 10 25521 minecraft.gsoc.games.skynet.ie.";
+          value = "0 10 25521 bumblebee.skynet.ie.";
         }
         {
           record = "minecraft.phildeb.games";
@@ -67,7 +67,7 @@
         {
           record = "_minecraft._tcp.minecraft.phildeb.games.skynet.ie.";
           r_type = "SRV";
-          value = "0 10 25522 minecraft.phildeb.games.skynet.ie.";
+          value = "0 10 25522 bumblebee.skynet.ie.";
         }
         {
           record = "minecraft-aged.compsoc.games";
@@ -77,7 +77,7 @@
         {
           record = "_minecraft._tcp.minecraft-aged.compsoc.games.skynet.ie.";
           r_type = "SRV";
-          value = "0 10 25519 minecraft.phildeb.games.skynet.ie.";
+          value = "0 10 25519 bumblebee.skynet.ie.";
         }
       ]
       # non skynet domains