From 5d549df76729154433077b438a2d99d7dd85cbef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 26 Feb 2025 15:31:05 +0100 Subject: [PATCH 1/4] Fix nginx /cache regex `nix-serve` does not handle duplicates in the path: ``` hut$ curl http://127.0.0.1:5000/nix-cache-info StoreDir: /nix/store WantMassQuery: 1 Priority: 30 hut$ curl http://127.0.0.1:5000//nix-cache-info File not found. ``` This meant that the cache was not accessible via: `curl https://jungle.bsc.es/cache/nix-cache-info` but `curl https://jungle.bsc.es/cachenix-cache-info` worked. --- m/hut/nginx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m/hut/nginx.nix b/m/hut/nginx.nix index 4e77eb2..867982b 100644 --- a/m/hut/nginx.nix +++ b/m/hut/nginx.nix @@ -38,7 +38,7 @@ in proxy_redirect http:// $scheme://; } location /cache { - rewrite ^/cache(.*) /$1 break; + rewrite ^/cache/(.*) /$1 break; proxy_pass http://127.0.0.1:5000; proxy_redirect http:// $scheme://; } -- 2.47.1 From 89fc9fb163e4c807378431048fb43f2f928adb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 26 Feb 2025 16:03:26 +0100 Subject: [PATCH 2/4] Add module to use hut as a binary substituter --- m/module/hut-substituter.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 m/module/hut-substituter.nix diff --git a/m/module/hut-substituter.nix b/m/module/hut-substituter.nix new file mode 100644 index 0000000..5a864bd --- /dev/null +++ b/m/module/hut-substituter.nix @@ -0,0 +1,10 @@ +{ config, ... }: +{ + nix.settings = + # Don't add hut as a cache to itself + assert config.networking.hostName != "hut"; + { + substituters = [ "https://jungle.bsc.es/cache" ]; + trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; + }; +} -- 2.47.1 From 982fc647cf7c1077e492952ded49292302dc1719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 26 Feb 2025 16:03:34 +0100 Subject: [PATCH 3/4] Use hut-substituter module in owl{1,2} and raccoon --- m/owl1/configuration.nix | 1 + m/owl2/configuration.nix | 1 + m/raccoon/configuration.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/m/owl1/configuration.nix b/m/owl1/configuration.nix index 7fc4a8f..20e3cf5 100644 --- a/m/owl1/configuration.nix +++ b/m/owl1/configuration.nix @@ -8,6 +8,7 @@ ../module/slurm-client.nix ../module/slurm-firewall.nix ../module/debuginfod.nix + ../module/hut-substituter.nix ]; # Select the this using the ID to avoid mismatches diff --git a/m/owl2/configuration.nix b/m/owl2/configuration.nix index 3ea9413..54849f6 100644 --- a/m/owl2/configuration.nix +++ b/m/owl2/configuration.nix @@ -8,6 +8,7 @@ ../module/slurm-client.nix ../module/slurm-firewall.nix ../module/debuginfod.nix + ../module/hut-substituter.nix ]; # Select the this using the ID to avoid mismatches diff --git a/m/raccoon/configuration.nix b/m/raccoon/configuration.nix index be9b10c..b67e90d 100644 --- a/m/raccoon/configuration.nix +++ b/m/raccoon/configuration.nix @@ -3,6 +3,7 @@ { imports = [ ../common/base.nix + ../module/hut-substituter.nix ]; # Don't install Grub on the disk yet -- 2.47.1 From 5cd8372c4ce3f4d6fd5efa1ec534472e149fc94c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 26 Feb 2025 18:22:43 +0100 Subject: [PATCH 4/4] Add instructions on how to use the cache in the web --- web/content/cache/_index.md | 68 +++++++++++++++++++++++++++++++++++++ web/content/hut/_index.md | 1 + 2 files changed, 69 insertions(+) create mode 100644 web/content/cache/_index.md diff --git a/web/content/cache/_index.md b/web/content/cache/_index.md new file mode 100644 index 0000000..541c1aa --- /dev/null +++ b/web/content/cache/_index.md @@ -0,0 +1,68 @@ +--- +title: "Cache" +description: "nix binary cache" +date: 2025-02-26T17:37:19+0100 +--- + +We provide a binary cache in `hut`, with the aim of avoiding unnecessary +recompilation of packages. + +The cache should contain common packages from bsckpkgs, but we don't provide +any guarantee that of what will be available in the cache, or for how long. +We recommend following the latest version of the `jungle` flake to avoid cache +misses. + +## Usage + +### From NixOS + +In NixOS, we can add the cache through the `nix.settings` option, which will +enable it for all builds in the system. + +```nix +{ ... }: { + nix.settings = { + substituters = [ "https://jungle.bsc.es" ]; + trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; + }; +} +``` + +### Interactively + +The cache can also be specified in a per-command basis through the flags +`--substituters` and `--trusted-public-keys`: + +```sh +nix build --substituters "https://jungle.bsc.es/cache" --trusted-public-keys "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" <...> +``` + +### Nix configuration file (non-nixos) + +If using nix outside of NixOS, you'll have to update `nix.conf` + +```bash +echo "substituters = https://jungle.bsc.es" >> /etc/nix/nix.conf +echo "trusted-public-keys = jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" >> /etc/nix/nix.conf +``` + +### Hint in flakes + +By adding the configuration below to a `flake.nix`, when someone uses the flake, +`nix` will interactively ask to trust and use the provided binary cache: + +```nix +{ + nixConfig = { + extra-substituters = [ + "https://jungle.bsc.es/cache" + ]; + extra-trusted-public-keys = [ + "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" + ]; + }; + outputs = { ... }: { + ... + }; +} +``` diff --git a/web/content/hut/_index.md b/web/content/hut/_index.md index 4d70451..302fb9d 100644 --- a/web/content/hut/_index.md +++ b/web/content/hut/_index.md @@ -13,6 +13,7 @@ which is available at `hut` or `xeon07`. It runs the following services: - Grafana: to plot the data in the web browser. - Slurmctld: to manage the SLURM nodes. - Gitlab runner: to run CI jobs from Gitlab. +- Nix binary cache: to serve cached nix builds (See [cache](/cache)) This node is prone to interruptions from all the services it runs, so it is not a good candidate for low noise executions. -- 2.47.1