Move backups around, enable whitestorm1

This commit is contained in:
asonix 2024-07-11 15:36:51 -05:00
parent 82a49acb72
commit c132a55fe3

100
flake.nix
View file

@ -1003,14 +1003,14 @@
inherit name; inherit name;
primaryIp = ip; primaryIp = ip;
mountDir = "/btrfs/nvme2"; mountDir = "/btrfs/nvme2";
subvolumes = [ "@garage" ]; subvolumes = [ "@exports" "@garage" ];
}; };
k3s = { ip, name }: { k3s = { ip, name }: {
inherit name; inherit name;
primaryIp = ip; primaryIp = ip;
mountDir = "/btrfs/nvme"; mountDir = "/btrfs/nvme";
subvolumes = [ "@garage" ]; subvolumes = [ "@exports" "@garage" ];
}; };
db = { ip, name }: { db = { ip, name }: {
@ -1109,20 +1109,6 @@
backup2 = backup2 =
let let
k3sOld = { ip, name }: {
inherit name;
primaryIp = ip;
mountDir = "/btrfs/nvme2";
subvolumes = [ "@exports" ];
};
k3s = { ip, name }: {
inherit name;
primaryIp = ip;
mountDir = "/btrfs/nvme";
subvolumes = [ "@exports" ];
};
db = { ip, name }: { db = { ip, name }: {
inherit name; inherit name;
primaryIp = ip; primaryIp = ip;
@ -1139,7 +1125,7 @@
graystripe = { graystripe = {
name = "graystripe"; name = "graystripe";
primaryIp = "192.168.5.9"; primaryIp = "192.168.5.11";
mountDir = "/btrfs/nvme"; mountDir = "/btrfs/nvme";
subvolumes = [ "@" "@root" "@home" ]; subvolumes = [ "@" "@root" "@home" ];
}; };
@ -1150,80 +1136,10 @@
selfIp6 = "2001:db8:20::191"; selfIp6 = "2001:db8:20::191";
backupHosts = (builtins.map firestar [ backupHosts = (builtins.map firestar [
{ {
name = "hdd"; name = "nvme1";
subvolumes = [ "@diskimages" "@documents" "@downloads" "@music" "@pictures" "@videos" ]; subvolumes = [ "@development" "@documents" "@downloads" "@music" "@notes" "@photos" "@videos" ];
} }
{ ]) ++ [ graystripe ] ++ (builtins.map db [
name = "nvme";
subvolumes = [ "@development" ];
}
]) ++ [ graystripe ] ++ (builtins.map k3sOld [
{
ip = "192.168.20.120";
name = "k3s1";
}
{
ip = "192.168.20.121";
name = "k3s2";
}
{
ip = "192.168.20.122";
name = "k3s3";
}
{
ip = "192.168.20.123";
name = "k3s4";
}
{
ip = "192.168.20.124";
name = "k3s5";
}
]) ++ (builtins.map k3s [
{
ip = "192.168.20.125";
name = "k3s6";
}
{
ip = "192.168.20.126";
name = "k3s7";
}
{
ip = "192.168.20.127";
name = "k3s8";
}
{
ip = "192.168.20.128";
name = "k3s9";
}
{
ip = "192.168.20.129";
name = "k3s10";
}
{
ip = "192.168.20.130";
name = "k3s11";
}
{
ip = "192.168.20.131";
name = "k3s12";
}
{
ip = "192.168.20.132";
name = "k3s13";
}
{
ip = "192.168.20.133";
name = "k3s14";
}
{
ip = "192.168.20.134";
name = "k3s15";
}
{
ip = "192.168.20.135";
name = "k3s16";
}
]) ++ (builtins.map db [
{ {
ip = "192.168.20.27"; ip = "192.168.20.27";
name = "whitestorm2"; name = "whitestorm2";
@ -1252,6 +1168,10 @@
name = "redtail2"; name = "redtail2";
ip = "192.168.20.24"; ip = "192.168.20.24";
} }
{
name = "whitestorm1";
ip = "192.168.20.80";
}
{ {
name = "whitestorm2"; name = "whitestorm2";
ip = "192.168.20.27"; ip = "192.168.20.27";