adapt to new version of binary cache module

This commit is contained in:
Yureka 2024-07-24 10:25:26 +02:00
parent ae1eda3033
commit 4dc4040ed8
2 changed files with 22 additions and 15 deletions

View file

@ -14,6 +14,7 @@
clientMaxBodySize = "50G"; clientMaxBodySize = "50G";
host = "binary-cache"; host = "binary-cache";
}; };
castoreDir = "/nvme";
caches = { caches = {
forkos = { forkos = {
grpcListenAddress = "[::1]:5000"; grpcListenAddress = "[::1]:5000";
@ -24,11 +25,16 @@
is_temporary = false; is_temporary = false;
path = "/var/lib/tvix-daemon-forkos/pathinfos.sled"; path = "/var/lib/tvix-daemon-forkos/pathinfos.sled";
}; };
default = lib.mkForce { nix = {
type = "nix"; type = "nix";
url = "nix+https://bagel-cache.s3-web.delroth.net"; base_url = "https://bagel-cache.s3-web.delroth.net";
blobservice = "default"; blob_service = "default";
directoryservice = "objectstore"; directory_service = "objectstore";
};
default = lib.mkForce {
type = "cache";
near = "sled";
far = "nix";
}; };
}; };
}; };
@ -41,22 +47,22 @@
is_temporary = false; is_temporary = false;
path = "/var/lib/tvix-daemon-cno/pathinfos.sled"; path = "/var/lib/tvix-daemon-cno/pathinfos.sled";
}; };
default = lib.mkForce { nix = {
type = "nix"; type = "nix";
url = "nix+https://cache.nixos.org?trusted-public-keys=cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="; base_url = "https://cache.nixos.org?trusted-public-keys=cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=";
blobservice = "default"; blob_service = "default";
directoryservice = "objectstore"; directory_service = "objectstore";
};
default = lib.mkForce {
type = "cache";
near = "sled";
far = "nix";
}; };
}; };
}; };
}; };
}; };
fileSystems."/var/lib/tvix-castore" = {
device = "/nvme";
options = [ "bind" ];
};
services.nginx.virtualHosts.binary-cache = { services.nginx.virtualHosts.binary-cache = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
@ -65,6 +71,7 @@
serverAliases = [ serverAliases = [
"cache.nixos.sh" "cache.nixos.sh"
]; ];
locations."/".proxyPass = "http://[::1]:5000";
}; };
networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.firewall.allowedTCPPorts = [ 80 443 ];

View file

@ -7,9 +7,9 @@
"url": "https://git.lix.systems/yu-re-ka/binary-cache" "url": "https://git.lix.systems/yu-re-ka/binary-cache"
}, },
"branch": "master", "branch": "master",
"revision": "608f8008ebd5e7a535544cbc8df18ea4a64bb66a", "revision": "bb40996c4b287fb5f1c20efcd086053e3b5e91c6",
"url": null, "url": null,
"hash": "0l9ldfkaamvdchg2b1x1qcs8pv8aqnhiswfmfqyyph4w0m1ky868" "hash": "1dw6pkqi0vmkh35i17yzfa8jgdqnfgaaxb2ry02m4pg68sfl0llq"
}, },
"nixpkgs": { "nixpkgs": {
"type": "Channel", "type": "Channel",