sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor swraid

Browse source
This commit is contained in:
zowoq 2023-08-18 00:11:18 +10:00
parent 2571a937a3
commit dcad37f8f2
5 changed files with 6 additions and 8 deletions

1
flake.nix
View file

@ -158,7 +158,6 @@
hydra = ./modules/nixos/hydra.nix; hydra = ./modules/nixos/hydra.nix;
monitoring = ./modules/nixos/monitoring; monitoring = ./modules/nixos/monitoring;
nur-update = ./modules/nixos/nur-update.nix; nur-update = ./modules/nixos/nur-update.nix;
raid = ./modules/nixos/raid.nix;
remote-builder-build04 = ./modules/nixos/remote-builder/build04.nix; remote-builder-build04 = ./modules/nixos/remote-builder/build04.nix;
remote-builder-darwin02 = ./modules/nixos/remote-builder/darwin02.nix; remote-builder-darwin02 = ./modules/nixos/remote-builder/darwin02.nix;
remote-builder-darwin03 = ./modules/nixos/remote-builder/darwin03.nix; remote-builder-darwin03 = ./modules/nixos/remote-builder/darwin03.nix;

3
hosts/build01/configuration.nix
View file

@ -13,7 +13,6 @@
imports = [ imports = [
inputs.srvos.nixosModules.hardware-hetzner-online-amd inputs.srvos.nixosModules.hardware-hetzner-online-amd
inputs.self.nixosModules.common inputs.self.nixosModules.common
inputs.self.nixosModules.raid
inputs.self.nixosModules.zfs inputs.self.nixosModules.zfs
inputs.self.nixosModules.community-builder inputs.self.nixosModules.community-builder
]; ];
@ -24,6 +23,8 @@
# /boot is a mirror raid # /boot is a mirror raid
boot.loader.grub.devices = [ "/dev/sda" "/dev/sdb" ]; boot.loader.grub.devices = [ "/dev/sda" "/dev/sdb" ];
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.swraid.enable = true;
boot.loader.grub.extraConfig = "insmod mdraid1x";
networking.hostName = "build01"; networking.hostName = "build01";
networking.hostId = "d2905767"; networking.hostId = "d2905767";

3
hosts/build02/configuration.nix
View file

@ -8,13 +8,14 @@
./nixpkgs-update-backup.nix ./nixpkgs-update-backup.nix
inputs.self.nixosModules.common inputs.self.nixosModules.common
inputs.self.nixosModules.hercules-ci inputs.self.nixosModules.hercules-ci
inputs.self.nixosModules.raid
inputs.self.nixosModules.zfs inputs.self.nixosModules.zfs
]; ];
# /boot is a mirror raid # /boot is a mirror raid
boot.loader.grub.devices = [ "/dev/nvme0n1" "/dev/nvme1n1" ]; boot.loader.grub.devices = [ "/dev/nvme0n1" "/dev/nvme1n1" ];
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.swraid.enable = true;
boot.loader.grub.extraConfig = "insmod mdraid1x";
networking.hostName = "build02"; networking.hostName = "build02";
networking.hostId = "af9ccc71"; networking.hostId = "af9ccc71";

3
hosts/build03/configuration.nix
View file

@ -14,7 +14,6 @@
inputs.srvos.nixosModules.hardware-hetzner-online-amd inputs.srvos.nixosModules.hardware-hetzner-online-amd
inputs.self.nixosModules.common inputs.self.nixosModules.common
inputs.self.nixosModules.hercules-ci inputs.self.nixosModules.hercules-ci
inputs.self.nixosModules.raid
inputs.self.nixosModules.watch-store inputs.self.nixosModules.watch-store
inputs.self.nixosModules.zfs inputs.self.nixosModules.zfs
inputs.self.nixosModules.remote-builder-build04 inputs.self.nixosModules.remote-builder-build04
@ -29,6 +28,8 @@
# /boot is a mirror raid # /boot is a mirror raid
boot.loader.grub.devices = [ "/dev/nvme0n1" "/dev/nvme1n1" ]; boot.loader.grub.devices = [ "/dev/nvme0n1" "/dev/nvme1n1" ];
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.swraid.enable = true;
boot.loader.grub.extraConfig = "insmod mdraid1x";
systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f9:3a:3b16::1/64"; systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f9:3a:3b16::1/64";

4
modules/nixos/raid.nix
View file

@ -1,4 +0,0 @@
{
# for mdraid 1.1
boot.loader.grub.extraConfig = "insmod mdraid1x";
}