Update deps, move to quartz64 for backup node

This commit is contained in:
asonix 2023-05-18 16:44:07 -05:00
parent c9aaca7a11
commit aa6f1a7b46
3 changed files with 22 additions and 19 deletions

View file

@ -1,4 +1,4 @@
#!/usr/bin/env bash
export LOCAL_KEY=/etc/nix/cache-priv-key.pem
sudo nix run github:serokell/deploy-rs $1
sudo nix run github:serokell/deploy-rs "${@:1}"

View file

@ -90,11 +90,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1684171562,
"narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=",
"lastModified": 1684280442,
"narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "55af203d468a6f5032a519cba4f41acf5a74b638",
"rev": "6c591e7adc514090a77209f56c9d0c551ab8530d",
"type": "github"
},
"original": {
@ -120,15 +120,15 @@
]
},
"locked": {
"lastModified": 1684281912,
"narHash": "sha256-dwDgkBXjvTvc0cmBSdCadsu6nvo559k/biu6zIc7/Xc=",
"owner": "asonix",
"lastModified": 1684352326,
"narHash": "sha256-ICwVFKSuhUEFjYgpga4HFuH73GmVUsKBltuAsm3ju/c=",
"owner": "nabam",
"repo": "nixos-rockchip",
"rev": "42287cea00f91fae4c2e17a5a84a0d7f32d87c14",
"rev": "041aaf706a8f4c3c1c93f51291c1b218dbf6168b",
"type": "github"
},
"original": {
"owner": "asonix",
"owner": "nabam",
"repo": "nixos-rockchip",
"type": "github"
}
@ -151,11 +151,11 @@
"rockchip": "rockchip"
},
"locked": {
"lastModified": 1684284535,
"narHash": "sha256-PqiqzCeKN7jeyBjyPcPH90RaNlOy/pNIGSAfztgvWxc=",
"lastModified": 1684353091,
"narHash": "sha256-O8cCTwp6npy3PmA2SeBkjbyXuSymKJG07CU8QvuGMLk=",
"ref": "asonix/nabam-sd-image",
"rev": "39a0503b133b7b67dac78e1a9011ed9ee58cdd0c",
"revCount": 28,
"rev": "35eb7a696bb07f163d66655eebaef825321b76fc",
"revCount": 29,
"type": "git",
"url": "https://git.asonix.dog/asonix/sd-images"
},

View file

@ -435,7 +435,7 @@
];
};
makeBackupConfig = system:
makeBoardBackupConfig = modules: system:
{ hostname
, selfIp
, unlockMounts ? true
@ -451,7 +451,7 @@
makeConfig {
inherit hostname;
extraModules = sd-images.packages.${system}.RockPro64v2.modules ++ [
extraModules = modules ++ [
(networkModule { inherit selfIp; })
(btrbkModule {
instances = backupHosts;
@ -536,6 +536,9 @@
];
};
makeRockPro64BackupConfig = makeBoardBackupConfig sd-images.packages.${system}.RockPro64v2.modules;
makeQuartz64ABackupConfig = makeBoardBackupConfig sd-images.packages.${system}.Quartz64A.modules;
makeGarageConfig = system:
{ hostname, selfIp, unlockMounts ? true, mountVolumes ? true }:
makeConfig {
@ -882,7 +885,7 @@
serverIp = "192.168.20.120";
};
backup-rockpro1 =
backup1 =
let
k3sMain = { ip, name }: {
inherit name;
@ -927,8 +930,8 @@
subvolumes = [ "@postgres" "@postgres-cfg" ];
};
in
makeBackupConfig system {
hostname = "backup-rockpro1";
makeQuartz64ABackupConfig system {
hostname = "backup1";
selfIp = "192.168.20.190";
backupHosts = [
(k3sMain {
@ -1099,7 +1102,7 @@
ip = "192.168.20.180";
}
{
name = "backup-rockpro1";
name = "backup1";
ip = "192.168.20.190";
}
];