diff --git a/hosts/server8/default.nix b/hosts/server8/default.nix index 50236921..a1eed25b 100644 --- a/hosts/server8/default.nix +++ b/hosts/server8/default.nix @@ -70,8 +70,8 @@ sops = { defaultSopsFile = ./secrets.yaml; secrets = { - "ceph/osd.1/keyfile" = {}; - "ceph/osd.2/keyfile" = {}; + "ceph/osd.1/keyfile" = { }; + "ceph/osd.2/keyfile" = { }; "machine-id" = { mode = "444"; path = "/etc/machine-id"; @@ -83,22 +83,25 @@ }; }; - skyflake.nomad.client.meta."c3d2.cpuSpeed" = "3"; - skyflake.storage.ceph.osds = [ { - id = 1; - fsid = "4b196252-efb6-4ad2-9e9b-cc3fcd664a3a"; - path = "/dev/zvol/server8_root/ceph-osd.1"; - keyfile = config.sops.secrets."ceph/osd.1/keyfile".path; - deviceClass = "ssd"; - } { - id = 2; - fsid = "b860ec59-3314-4fd1-be45-35a46fd8c059"; - path = "/dev/zvol/server8_hdd/ceph-osd.2"; - keyfile = config.sops.secrets."ceph/osd.2/keyfile".path; - deviceClass = "hdd"; - } ]; - # TODO: remove - skyflake.storage.ceph.package = lib.mkForce pkgs.ceph_17_2; + skyflake = { + nomad.client.meta."c3d2.cpuSpeed" = "3"; + storage.ceph.osds = [{ + id = 1; + fsid = "4b196252-efb6-4ad2-9e9b-cc3fcd664a3a"; + path = "/dev/zvol/server8_root/ceph-osd.1"; + keyfile = config.sops.secrets."ceph/osd.1/keyfile".path; + deviceClass = "ssd"; + } + { + id = 2; + fsid = "b860ec59-3314-4fd1-be45-35a46fd8c059"; + path = "/dev/zvol/server8_hdd/ceph-osd.2"; + keyfile = config.sops.secrets."ceph/osd.2/keyfile".path; + deviceClass = "hdd"; + }]; + # TODO: remove + storage.ceph.package = lib.mkForce pkgs.ceph_17_2; + }; system.stateVersion = "22.11"; }