diff --git a/rossby/default.nix b/rossby/default.nix index 4f54b52..43083cb 100644 --- a/rossby/default.nix +++ b/rossby/default.nix @@ -98,6 +98,7 @@ let }; networking = { + useDHCP = false; domain = mkDefault "cluster.local"; defaultGateway = mkDefault "172.16.239.1"; nameservers = mkDefault [ "8.8.8.8" ]; @@ -144,11 +145,10 @@ let client = true; clusterName = "rossby"; controlMachine = "rossby-manage"; - # dbdHost = "ekman-manage.obx.hs"; + dbdHost = "10.255.241.15"; mungeKey = ./munge.key; jwtKey = ./jwt_hs256.key; - mungeUid = mkDefault 994; # hack - # slurmUid = mkDefault 307; # hack + slurmKey = ./slurm.key; # pkey = "0x7666"; mailDomain = "oceanbox.io"; nodeName = [ @@ -256,7 +256,7 @@ let }; fs-work = { hostNames = [ - "fs-work" "fs-work.cluster.local" "172.16.239.201" + "fs-work" "fs-work.cluster.local" "172.16.239.210" ]; publicKeyFile = ./fs-work/ssh_host_key.pub; }; diff --git a/rossby/fs-work/default.nix b/rossby/fs-work/default.nix index 0b79edc..5769b7d 100644 --- a/rossby/fs-work/default.nix +++ b/rossby/fs-work/default.nix @@ -45,8 +45,6 @@ in { }; }; - features.hpc.slurm.mungeUid = 994; - features = { host = { inherit address; diff --git a/rossby/manage/default.nix b/rossby/manage/default.nix index 8830b1b..77e3ed6 100644 --- a/rossby/manage/default.nix +++ b/rossby/manage/default.nix @@ -77,8 +77,7 @@ in { hpc = { slurm.server = true; slurm.slurmrestd = true; - slurm.dbdServer = true; - slurm.mungeUid = 993; + slurm.dbdServer = false; manageNode = true; };