kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Add the disko configuration to all VMs

Browse source
This commit is contained in:
Nicolas Jeannerod 2025-02-21 19:26:18 +01:00
parent b90fc3300a
commit 3dc7f49a9c
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
6 changed files with 146 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
infra/common/nixos/hardware.nix
View file

@ -21,4 +21,42 @@
kernelModules = [ "dm-snapshot" ]; kernelModules = [ "dm-snapshot" ];
}; };
}; };
disko.devices.disk.main = {
device = "/dev/sda";
type = "disk";
content = {
type = "gpt";
partitions = {
MBR = {
priority = 0;
size = "1M";
type = "EF02";
};
ESP = {
priority = 1;
size = "500M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
priority = 2;
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
};
};
};
} }

40
infra/fedi300/default.nix
View file

@ -12,23 +12,29 @@
}; };
}; };
nixos.module = { nixos.module =
imports = [ { lib, ... }:
./forgejo-actions-runner.nix {
]; imports = [
./forgejo-actions-runner.nix
fileSystems."/" = {
device = "/dev/disk/by-uuid/cbcfaf6b-39bd-4328-9f53-dea8a9d32ecc";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/1A4E-07F4";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
]; ];
## NOTE: This VM was created manually, which requires us to override the
## default disko-based `fileSystems` definition.
fileSystems = lib.mkForce {
"/" = {
device = "/dev/disk/by-uuid/cbcfaf6b-39bd-4328-9f53-dea8a9d32ecc";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/1A4E-07F4";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
];
};
};
}; };
};
} }

42
infra/vm02116/default.nix
View file

@ -4,25 +4,31 @@
ipv6.address = "2a00:51c0:12:1201::20"; ipv6.address = "2a00:51c0:12:1201::20";
}; };
nixos.module = { nixos.module =
imports = [ { lib, ... }:
./forgejo.nix {
]; imports = [
./forgejo.nix
];
## vm02116 is running on old hardware based on a Xen VM environment, so it ## vm02116 is running on old hardware based on a Xen VM environment, so it
## needs these extra options. Once the VM gets moved to a newer node, these ## needs these extra options. Once the VM gets moved to a newer node, these
## two options can safely be removed. ## two options can safely be removed.
boot.initrd.availableKernelModules = [ "xen_blkfront" ]; boot.initrd.availableKernelModules = [ "xen_blkfront" ];
services.xe-guest-utilities.enable = true; services.xe-guest-utilities.enable = true;
fileSystems."/" = { ## NOTE: This VM was created manually, which requires us to override the
device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853"; ## default disko-based `fileSystems` definition.
fsType = "ext4"; fileSystems = lib.mkForce {
"/" = {
device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/2CE2-1173";
fsType = "vfat";
};
};
}; };
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/2CE2-1173";
fsType = "vfat";
};
};
} }

32
infra/vm02179/default.nix
View file

@ -4,19 +4,25 @@
ipv6.address = "2a00:51c0:12:1201::179"; ipv6.address = "2a00:51c0:12:1201::179";
}; };
nixos.module = { nixos.module =
fileSystems."/" = { { lib, ... }:
device = "/dev/disk/by-uuid/119863f8-55cf-4e2f-ac17-27599a63f241"; {
fsType = "ext4"; ## NOTE: This VM was created manually, which requires us to override the
}; ## default disko-based `fileSystems` definition.
fileSystems = lib.mkForce {
"/" = {
device = "/dev/disk/by-uuid/119863f8-55cf-4e2f-ac17-27599a63f241";
fsType = "ext4";
};
fileSystems."/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/D9F4-9BF0"; device = "/dev/disk/by-uuid/D9F4-9BF0";
fsType = "vfat"; fsType = "vfat";
options = [ options = [
"fmask=0022" "fmask=0022"
"dmask=0022" "dmask=0022"
]; ];
};
};
}; };
};
} }

32
infra/vm02186/default.nix
View file

@ -4,19 +4,25 @@
ipv6.address = "2a00:51c0:12:1201::186"; ipv6.address = "2a00:51c0:12:1201::186";
}; };
nixos.module = { nixos.module =
fileSystems."/" = { { lib, ... }:
device = "/dev/disk/by-uuid/833ac0f9-ad8c-45ae-a9bf-5844e378c44a"; {
fsType = "ext4"; ## NOTE: This VM was created manually, which requires us to override the
}; ## default disko-based `fileSystems` definition.
fileSystems = lib.mkForce {
"/" = {
device = "/dev/disk/by-uuid/833ac0f9-ad8c-45ae-a9bf-5844e378c44a";
fsType = "ext4";
};
fileSystems."/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/B4D5-3AF9"; device = "/dev/disk/by-uuid/B4D5-3AF9";
fsType = "vfat"; fsType = "vfat";
options = [ options = [
"fmask=0022" "fmask=0022"
"dmask=0022" "dmask=0022"
]; ];
};
};
}; };
};
} }

40
infra/vm02187/default.nix
View file

@ -4,23 +4,29 @@
ipv6.address = "2a00:51c0:12:1201::187"; ipv6.address = "2a00:51c0:12:1201::187";
}; };
nixos.module = { nixos.module =
imports = [ { lib, ... }:
./wiki.nix {
]; imports = [
./wiki.nix
fileSystems."/" = {
device = "/dev/disk/by-uuid/a46a9c46-e32b-4216-a4aa-8819b2cd0d49";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/6AB5-4FA8";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
]; ];
## NOTE: This VM was created manually, which requires us to override the
## default disko-based `fileSystems` definition.
fileSystems = lib.mkForce {
"/" = {
device = "/dev/disk/by-uuid/a46a9c46-e32b-4216-a4aa-8819b2cd0d49";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/6AB5-4FA8";
fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
];
};
};
}; };
};
} }