From fcd136ed4ed231a7cd609e4fa31281cd5e1aa5c5 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Fri, 12 Sep 2025 14:32:42 +0200 Subject: [PATCH] fix: partially fix a totally botched merge. --- rossby/c0/default.nix | 4 -- .../c0-10.nix | 0 .../c0-11.nix | 0 .../c0-13.nix | 0 .../c0-14.nix | 0 .../c0-15.nix | 0 .../c0-16.nix | 0 .../c0-17.nix | 0 .../c0-18.nix | 0 .../c0-19.nix | 0 .../c0-2.nix | 0 .../c0-20.nix | 0 .../c0-3.nix | 0 .../c0-4.nix | 0 .../c0-5.nix | 0 .../c0-6.nix | 0 .../c0-8.nix | 0 .../c0-9.nix | 0 rossby/default.nix | 55 +------------------ rossby/login/default.nix | 7 --- rossby/mounts.nix | 9 --- 21 files changed, 2 insertions(+), 73 deletions(-) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-10.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-11.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-13.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-14.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-15.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-16.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-17.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-18.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-19.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-2.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-20.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-3.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-4.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-5.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-6.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-8.nix (100%) rename rossby/c0/{hardware-config.d => hardware-configuration.d}/c0-9.nix (100%) diff --git a/rossby/c0/default.nix b/rossby/c0/default.nix index 2c75392..6498275 100644 --- a/rossby/c0/default.nix +++ b/rossby/c0/default.nix @@ -35,11 +35,7 @@ let mkCompute = host: let -<<<<<<<< HEAD:rossby/c0/default.nix - hw = ./hardware-config.d + "/${host.name}.nix"; -======== hw = ./hardware-configuration.d + "/${host.name}.nix"; ->>>>>>>> ekman:ekman/c0/default.nix in { "${host.name}" = { cluster = { diff --git a/rossby/c0/hardware-config.d/c0-10.nix b/rossby/c0/hardware-configuration.d/c0-10.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-10.nix rename to rossby/c0/hardware-configuration.d/c0-10.nix diff --git a/rossby/c0/hardware-config.d/c0-11.nix b/rossby/c0/hardware-configuration.d/c0-11.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-11.nix rename to rossby/c0/hardware-configuration.d/c0-11.nix diff --git a/rossby/c0/hardware-config.d/c0-13.nix b/rossby/c0/hardware-configuration.d/c0-13.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-13.nix rename to rossby/c0/hardware-configuration.d/c0-13.nix diff --git a/rossby/c0/hardware-config.d/c0-14.nix b/rossby/c0/hardware-configuration.d/c0-14.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-14.nix rename to rossby/c0/hardware-configuration.d/c0-14.nix diff --git a/rossby/c0/hardware-config.d/c0-15.nix b/rossby/c0/hardware-configuration.d/c0-15.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-15.nix rename to rossby/c0/hardware-configuration.d/c0-15.nix diff --git a/rossby/c0/hardware-config.d/c0-16.nix b/rossby/c0/hardware-configuration.d/c0-16.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-16.nix rename to rossby/c0/hardware-configuration.d/c0-16.nix diff --git a/rossby/c0/hardware-config.d/c0-17.nix b/rossby/c0/hardware-configuration.d/c0-17.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-17.nix rename to rossby/c0/hardware-configuration.d/c0-17.nix diff --git a/rossby/c0/hardware-config.d/c0-18.nix b/rossby/c0/hardware-configuration.d/c0-18.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-18.nix rename to rossby/c0/hardware-configuration.d/c0-18.nix diff --git a/rossby/c0/hardware-config.d/c0-19.nix b/rossby/c0/hardware-configuration.d/c0-19.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-19.nix rename to rossby/c0/hardware-configuration.d/c0-19.nix diff --git a/rossby/c0/hardware-config.d/c0-2.nix b/rossby/c0/hardware-configuration.d/c0-2.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-2.nix rename to rossby/c0/hardware-configuration.d/c0-2.nix diff --git a/rossby/c0/hardware-config.d/c0-20.nix b/rossby/c0/hardware-configuration.d/c0-20.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-20.nix rename to rossby/c0/hardware-configuration.d/c0-20.nix diff --git a/rossby/c0/hardware-config.d/c0-3.nix b/rossby/c0/hardware-configuration.d/c0-3.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-3.nix rename to rossby/c0/hardware-configuration.d/c0-3.nix diff --git a/rossby/c0/hardware-config.d/c0-4.nix b/rossby/c0/hardware-configuration.d/c0-4.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-4.nix rename to rossby/c0/hardware-configuration.d/c0-4.nix diff --git a/rossby/c0/hardware-config.d/c0-5.nix b/rossby/c0/hardware-configuration.d/c0-5.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-5.nix rename to rossby/c0/hardware-configuration.d/c0-5.nix diff --git a/rossby/c0/hardware-config.d/c0-6.nix b/rossby/c0/hardware-configuration.d/c0-6.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-6.nix rename to rossby/c0/hardware-configuration.d/c0-6.nix diff --git a/rossby/c0/hardware-config.d/c0-8.nix b/rossby/c0/hardware-configuration.d/c0-8.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-8.nix rename to rossby/c0/hardware-configuration.d/c0-8.nix diff --git a/rossby/c0/hardware-config.d/c0-9.nix b/rossby/c0/hardware-configuration.d/c0-9.nix similarity index 100% rename from rossby/c0/hardware-config.d/c0-9.nix rename to rossby/c0/hardware-configuration.d/c0-9.nix diff --git a/rossby/default.nix b/rossby/default.nix index 01d66b6..37aafca 100644 --- a/rossby/default.nix +++ b/rossby/default.nix @@ -144,28 +144,12 @@ let mungeKey = ./munge.key; mungeUid = mkDefault 994; # hack # pkey = "0x7666"; -<<<<<<<< HEAD:rossby/default.nix controlMachine = "rossby-manage"; mailDomain = "oceanbox.io"; nodeName = [ -<<<<<<< HEAD - "c0-[1-16] Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN" - "rossby-login Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN" - "rossby-manage Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN" -======== - controlMachine = "ekman-manage"; - mailDomain = "oceanbox.io"; - nodeName = [ - "c0-[1-18] Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN" - "c1-[1-8] Sockets=1 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=100000 State=UNKNOWN" - "ekman Sockets=2 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=256000 TmpDisk=500000 State=UNKNOWN" - "ekman-manage Sockets=2 CoresPerSocket=16 ThreadsPerCore=2 RealMemory=92000 TmpDisk=200000 State=UNKNOWN" ->>>>>>>> ekman:ekman/default.nix -======= - "c0-[1-20] Sockets=2 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=350000 TmpDisk=400000 State=UNKNOWN" + "c0-[1-20] Sockets=2 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=382000 TmpDisk=400000 State=UNKNOWN" "rossby-login Sockets=1 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=60000 TmpDisk=400000 State=UNKNOWN" "rossby-manage Sockets=1 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=60000 TmpDisk=400000 State=UNKNOWN" ->>>>>>> origin/rossby ]; partitionName = [ "batch Nodes=c0-[1-20] Default=YES MaxTime=INFINITE State=UP" @@ -213,13 +197,8 @@ let initca = ./ca; cidr = "10.10.0.0/16"; master = { -<<<<<<<< HEAD:rossby/default.nix name = "rossby-manage"; address = "172.16.239.221"; -======== - name = "ekman-manage"; - address = "10.255.241.99"; ->>>>>>>> ekman:ekman/default.nix # extraSANs = [ # "rossby-manage.oceanbox.io" # ]; @@ -258,41 +237,17 @@ let }; programs.ssh.knownHosts = { -<<<<<<<< HEAD:rossby/default.nix rossby-manage = { hostNames = [ "manage" "manage.compute.local" "rossby-manage.oceanbox.io" "172.16.239.221" "172.16.240.221" -======== - ekman-manage = { - hostNames = [ - "ekman-manage" "ekman-manage.cluster.local" "frontend.oceanbox.io" "10.255.241.99" "10.255.243.99" ->>>>>>>> ekman:ekman/default.nix ]; publicKeyFile = ./manage/ssh_host_key.pub; }; rossby-login = { hostNames = [ -<<<<<<<< HEAD:rossby/default.nix - "rossby" "rpssby-login" "rossby-login.compute.local" "rossby.compute.local" "rossby.oceanbox.io" "172.16.239.222" "172.16.240.222" + "rossby" "rossby-login" "rossby-login.compute.local" "rossby.compute.local" "rossby.oceanbox.io" "172.16.239.222" "172.16.240.222" ]; publicKeyFile = ./login/ssh_host_key.pub; -======== - "ekman" "ekman.cluster.local" "ekman.oceanbox.io" "10.255.241.100" "10.255.243.100" - ]; - publicKeyFile = ./logon/ssh_host_key.pub; - }; - fs-work = { - hostNames = [ - "fs-work" "fs-work.cluster.local" "10.255.241.90" "10.255.243.90" - ]; - publicKeyFile = ./fs-work/ssh_host_key.pub; - }; - fs-backup = { - hostNames = [ - "fs-backup" "fs-backup.cluster.local" "10.255.241.80" "10.255.243.80" - ]; - publicKeyFile = ./fs-backup/ssh_host_key.pub; ->>>>>>>> ekman:ekman/default.nix }; # fs-work = { # hostNames = [ @@ -306,15 +261,9 @@ let "${x.name}" = { hostNames = [ "${x.name}" -<<<<<<<< HEAD:rossby/default.nix "${x.name}.compute.local" "172.16.239.${n}" "172.16.240.${n}" -======== - "${x.name}.cluster.local" - "10.255.241.${n}" - "10.255.243.${n}" ->>>>>>>> ekman:ekman/default.nix ]; publicKeyFile = x.pubkey; }; diff --git a/rossby/login/default.nix b/rossby/login/default.nix index 3ac4878..ab4e44c 100644 --- a/rossby/login/default.nix +++ b/rossby/login/default.nix @@ -113,17 +113,10 @@ in networking = { useDHCP = false; hostName = name; -<<<<<<<< HEAD:rossby/login/default.nix interfaces.enp129s0f0 = { useDHCP = false; ipv4.addresses = [ { inherit address; -======== - interfaces.enp33s0f3np3 = { - useDHCP = false; - ipv4.addresses = [ { - address = address; ->>>>>>>> ekman:ekman/login/default.nix prefixLength = 24; } ]; # ipv4.routes = [ diff --git a/rossby/mounts.nix b/rossby/mounts.nix index 73bfacc..18520eb 100644 --- a/rossby/mounts.nix +++ b/rossby/mounts.nix @@ -9,13 +9,8 @@ let users = if cfg.users then { -<<<<<<<< HEAD:rossby/mounts.nix "/users" = { device = "172.16.239.222:/home"; -======== - "/frontend" = { - device = "10.255.241.100:/home"; ->>>>>>>> ekman:ekman/mounts.nix fsType = "nfs4"; options = [ "soft" @@ -77,11 +72,7 @@ let }; } else {}; -<<<<<<<< HEAD:rossby/mounts.nix fileSystems = users // opt // data // work // ceph; -======== - fileSystems = users // opt // data // work // backup // ceph; ->>>>>>>> ekman:ekman/mounts.nix automount = mountpoint: if cfg.automount.enable && builtins.hasAttr mountpoint fileSystems then