mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-12-06 21:17:14 -06:00
chore: switched storage drive from raid0 to raid1
This commit is contained in:
parent
1a62fd7463
commit
857f2e39a8
3 changed files with 10 additions and 34 deletions
|
|
@ -17,7 +17,7 @@ in
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
settings = {
|
settings = {
|
||||||
"raid0" = {
|
"raid0" = {
|
||||||
path = "/mnt/raid0";
|
path = "/mnt/storage";
|
||||||
writable = "yes";
|
writable = "yes";
|
||||||
"valid users" = user0;
|
"valid users" = user0;
|
||||||
"force user" = user0;
|
"force user" = user0;
|
||||||
|
|
@ -29,11 +29,6 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /mnt/raid0 0755 ${user0} users -"
|
|
||||||
"Z /mnt/raid0 0755 ${user0} users -"
|
|
||||||
];
|
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
firewall = {
|
firewall = {
|
||||||
allowedTCPPorts = [
|
allowedTCPPorts = [
|
||||||
|
|
|
||||||
|
|
@ -6,31 +6,10 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (flake.config.people) user0;
|
inherit (flake.config.people) user0;
|
||||||
inherit (flake.config.machines.devices) eris;
|
|
||||||
erisSecrets = config.sops.secrets."network/server".path;
|
|
||||||
|
|
||||||
rootDevice = "/dev/disk/by-label/root";
|
rootDevice = "/dev/disk/by-label/root";
|
||||||
bootDevice = "/dev/disk/by-label/BOOT";
|
bootDevice = "/dev/disk/by-label/BOOT";
|
||||||
|
|
||||||
sambaDrives = [
|
|
||||||
"samba0"
|
|
||||||
];
|
|
||||||
|
|
||||||
sambaFolders = [
|
|
||||||
"raid0"
|
|
||||||
];
|
|
||||||
|
|
||||||
sambaMounts = sambaDrive: folder: {
|
|
||||||
name = "${eris.${sambaDrive}.mount}/${folder}";
|
|
||||||
value = {
|
|
||||||
device = "${eris.${sambaDrive}.device}/${folder}";
|
|
||||||
fsType = "cifs";
|
|
||||||
options = eris.${sambaDrive}.options ++ [
|
|
||||||
"credentials=${erisSecrets}"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
|
|
@ -77,10 +56,7 @@ in
|
||||||
neededForBoot = true;
|
neededForBoot = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
};
|
||||||
// (builtins.listToAttrs (
|
|
||||||
builtins.concatMap (drive: map (folder: sambaMounts drive folder) sambaFolders) sambaDrives
|
|
||||||
));
|
|
||||||
|
|
||||||
boot.initrd.postResumeCommands = lib.mkAfter ''
|
boot.initrd.postResumeCommands = lib.mkAfter ''
|
||||||
mkdir /btrfs_tmp
|
mkdir /btrfs_tmp
|
||||||
|
|
|
||||||
|
|
@ -38,12 +38,13 @@ in
|
||||||
device = "/dev/disk/by-uuid/B645-7527";
|
device = "/dev/disk/by-uuid/B645-7527";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
"/mnt/raid0" = {
|
"/mnt/storage" = {
|
||||||
device = "/dev/md127";
|
device = "/dev/md0";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
options = [
|
options = [
|
||||||
"defaults"
|
"defaults"
|
||||||
"nofail"
|
"nofail"
|
||||||
|
"x-systemd.device-timeout=10"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -57,8 +58,12 @@ in
|
||||||
|
|
||||||
boot.swraid.enable = true;
|
boot.swraid.enable = true;
|
||||||
boot.swraid.mdadmConf = ''
|
boot.swraid.mdadmConf = ''
|
||||||
ARRAY /dev/md0 level=raid0 num-devices=2 metadata=1.2
|
ARRAY /dev/md0 metadata=1.2 name=eris:storage UUID=64659038:a939a18d:8cdc0f3f:97171a50
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"d /mnt/storage 2775 root root -"
|
||||||
|
];
|
||||||
|
|
||||||
services.udisks2.enable = true;
|
services.udisks2.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue