From a91667bdb6264e609594b4e818ededb9e73ed687 Mon Sep 17 00:00:00 2001
From: jehad <jehad@leastauthority.com>
Date: Wed, 22 Mar 2023 06:34:47 +0100
Subject: [PATCH] redeployment of storage003
Co-authored-by: Benoit Donneaux <benoit@leastauthority.com>
Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>
---
morph/grid/hro-cloud/storage003-config.nix | 4 +--
morph/grid/hro-cloud/storage003-hardware.nix | 27 ++++++++------------
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/morph/grid/hro-cloud/storage003-config.nix b/morph/grid/hro-cloud/storage003-config.nix
index 6abce610..188bdd5a 100644
--- a/morph/grid/hro-cloud/storage003-config.nix
+++ b/morph/grid/hro-cloud/storage003-config.nix
@@ -5,7 +5,7 @@
"prefixLength" = 24;
"gateway" = "151.80.28.254";
"gatewayInterface" = "eno3";
- "grubDeviceID" = "nodev";
- #"grubDeviceID" = "nvme-eui.e8238fa6bf530001001b448b463b77bf";
+ #"grubDeviceID" = "nodev";
+ "grubDeviceID" = "nvme-eui.e8238fa6bf530001001b448b463b77bf";
"systemd-boot" = true;
}
diff --git a/morph/grid/hro-cloud/storage003-hardware.nix b/morph/grid/hro-cloud/storage003-hardware.nix
index 3ff55090..f29193d1 100644
--- a/morph/grid/hro-cloud/storage003-hardware.nix
+++ b/morph/grid/hro-cloud/storage003-hardware.nix
@@ -8,34 +8,27 @@
[ (modulesPath + "/installer/scan/not-detected.nix")
];
- boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "ehci_pci" "megaraid_sas" "usbhid" ];
+ boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.supportedFilesystems = [ "zfs" ];
- boot.kernel.sysctl = { "vm.swappiness" = 0; };
fileSystems."/" =
- { device = "/dev/disk/by-uuid/56a050e2-daee-40e2-becb-17d1f7908ceb";
+ { device = "/dev/disk/by-uuid/8f88c0f1-3aef-41ec-bfd7-55b4ba6c1341";
fsType = "ext4";
};
fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/B89B-F110";
+ { device = "/dev/disk/by-uuid/23DC-4051";
fsType = "vfat";
};
-
- # Manually created using:
- # zpool create -f -m legacy -o ashift=12 root raidz /dev/disk/by-id/{wwn-0x5000cca249d43969,wwn-0x5000039a8bc0075e,wwn-0x5000cca249d44a67,wwn-0x5000cca249d46730,wwn-0x5000cca25dcc719c,wwn-0x5000cca25dcc0241,wwn-0x5000039a8bc00765}
- fileSystems."/storage" =
- { device = "root";
- fsType = "zfs";
- };
-
- swapDevices =
- [ { device = "/dev/disk/by-uuid/e47cfddc-485c-46fb-9004-c9b8619b81ff"; }
+ swapDevices =
+ [ { device = "/dev/disk/by-uuid/b02af75a-ea3a-47cf-ad40-c6611ee4dc09"; }
];
-
- nix.maxJobs = lib.mkDefault 24;
- powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+ fileSystems."/storage" = {
+ device = "root";
+ fsType = "zfs";
+ };
+ hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}
--
GitLab