From c9624213ed3298f0a7cab6d4423240a154efcbc3 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Thu, 25 Sep 2025 15:52:30 +0200
Subject: [PATCH] fix: fix slurmdbd setup

---
 modules/hpc/slurm.nix     | 12 +++---------
 rossby/manage/default.nix | 15 +++++++++------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/modules/hpc/slurm.nix b/modules/hpc/slurm.nix
index 9e3f32e..0cdacf2 100644
--- a/modules/hpc/slurm.nix
+++ b/modules/hpc/slurm.nix
@@ -25,6 +25,7 @@ let
       extraConfig = ''
         # AccountingStorageType=accounting_storage/none
         AccountingStorageType=accounting_storage/slurmdbd
+        AccountingStorageExternalHost=${cfg.dbdHosts}
         JobAcctGatherType=jobacct_gather/linux
         MailDomain=${cfg.mailDomain}
         MailProg=/run/wrappers/bin/sendmail
@@ -65,7 +66,7 @@ let
       # '';
       dbdserver = {
         enable = true;
-        dbdHost = cfg.dbdHost;
+        dbdHost = cfg.controlMachine;
         # storagePass  = cfg.storagePass;
       };
     };
@@ -120,13 +121,6 @@ let
 
 
   slurmrestd = {
-    services.dnsmasq.enable = true;
-    services.dnsmasq.settings = {
-      domain = [ "cluster.local"  ];
-      address = [ "/slurmctld.cluster.local/127.0.0.1" ];
-      srv-host= "_slurmctld._tcp.cluster.local,slurmctld.cluster.local,6817,0,5";
-    };
-
     systemd.services.slurmrestd = {
         description = "Slurm REST API service";
         wantedBy = [ "multi-user.target" ];
@@ -182,7 +176,7 @@ in
       default = null;
     };
 
-    dbdHost = mkOption {
+    dbdHosts = mkOption {
       type = types.str;
       default = null;
     };
diff --git a/rossby/manage/default.nix b/rossby/manage/default.nix
index de1e100..6d12b9d 100644
--- a/rossby/manage/default.nix
+++ b/rossby/manage/default.nix
@@ -49,7 +49,7 @@ in {
         automount.enable = true;
         users = false;
         opt = true;
-        work = true;
+        work = false;
         data = true;
         ceph = true;
       };
@@ -78,7 +78,7 @@ in {
         slurm.server = true;
         slurm.slurmrestd = true;
         slurm.mungeUid = 993;
-        slurm.dbdHost = "ekman-manage.obx.hs";
+        slurm.dbdHosts = "ekman-manage.obx.hs";
         manageNode = true;
       };
 
@@ -265,13 +265,16 @@ in {
         '';
     };
 
+    services.dnsmasq.enable = true;
     services.dnsmasq.settings = {
-      domain = [ "hbx.hs" ];
+      domain = [ "cluster.local" ];
       server = [
-        "8.8.8.8"
         "/obx.hs/100.100.100.100" # headscale dns
       ];
-      address = [ ];
+      address = [
+        "/slurmctld.cluster.local/127.0.0.1"
+      ];
+      srv-host = "_slurmctld._tcp.cluster.local,slurmctld.cluster.local,6817,0,5";
     };
 
     # Use nvd to get package diff before apply
@@ -325,7 +328,7 @@ in {
     useRoutingFeatures = "both"; # for exit-node usage
     extraUpFlags = [
       "--login-server=https://headscale.svc.oceanbox.io"
-      # "--accept-dns=true" # see dnsmasq
+      "--accept-dns=true" # see dnsmasq
       "--advertise-exit-node"
       "--advertise-routes=172.16.239.0/24,172.16.238.0/24"
     ];