From 0c4928c978a0430ae0ccd641c9e6dd20b79b7f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Thu, 25 Sep 2025 17:10:10 +0200 Subject: [PATCH] Use hut substituter in all nodes --- m/apex/configuration.nix | 7 +------ m/bay/configuration.nix | 1 + m/eudy/configuration.nix | 1 + m/fox/configuration.nix | 7 +------ m/raccoon/configuration.nix | 6 +----- m/tent/configuration.nix | 1 + m/weasel/configuration.nix | 1 + 7 files changed, 7 insertions(+), 17 deletions(-) diff --git a/m/apex/configuration.nix b/m/apex/configuration.nix index 17828a32..fb9c0cbd 100644 --- a/m/apex/configuration.nix +++ b/m/apex/configuration.nix @@ -5,6 +5,7 @@ ../common/xeon.nix ../common/ssf/hosts.nix ../module/ceph.nix + ../module/hut-substituter.nix ../module/slurm-server.nix ./nfs.nix ./wireguard.nix @@ -76,10 +77,4 @@ iptables -I nixos-fw 2 -p tcp -s 84.88.52.176 -j nixos-fw-refuse ''; }; - - # Use tent for cache - nix.settings = { - extra-substituters = [ "https://jungle.bsc.es/cache" ]; - extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; - }; } diff --git a/m/bay/configuration.nix b/m/bay/configuration.nix index 5c6f93ca..47e82644 100644 --- a/m/bay/configuration.nix +++ b/m/bay/configuration.nix @@ -3,6 +3,7 @@ { imports = [ ../common/ssf.nix + ../module/hut-substituter.nix ../module/monitoring.nix ]; diff --git a/m/eudy/configuration.nix b/m/eudy/configuration.nix index d6761354..ddb894e1 100644 --- a/m/eudy/configuration.nix +++ b/m/eudy/configuration.nix @@ -9,6 +9,7 @@ ./cpufreq.nix ./fs.nix ./users.nix + ../module/hut-substituter.nix ../module/debuginfod.nix ]; diff --git a/m/fox/configuration.nix b/m/fox/configuration.nix index 3f6742b1..a3b0c526 100644 --- a/m/fox/configuration.nix +++ b/m/fox/configuration.nix @@ -8,6 +8,7 @@ ../module/emulation.nix ../module/nvidia.nix ../module/slurm-client.nix + ../module/hut-substituter.nix ./wireguard.nix ]; @@ -72,12 +73,6 @@ interfaces.enp1s0f0np0.useDHCP = true; }; - # Use hut for cache - nix.settings = { - extra-substituters = [ "https://jungle.bsc.es/cache" ]; - extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; - }; - # Recommended for new graphics cards hardware.nvidia.open = true; diff --git a/m/raccoon/configuration.nix b/m/raccoon/configuration.nix index cec17e6f..1a29b4ca 100644 --- a/m/raccoon/configuration.nix +++ b/m/raccoon/configuration.nix @@ -8,6 +8,7 @@ ../module/ssh-hut-extern.nix ../module/nvidia.nix ../eudy/kernel/perf.nix + ../module/hut-substituter.nix ]; # Don't install Grub on the disk yet @@ -43,11 +44,6 @@ }; }; - nix.settings = { - extra-substituters = [ "https://jungle.bsc.es/cache" ]; - extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; - }; - # Enable performance governor powerManagement.cpuFreqGovernor = "performance"; diff --git a/m/tent/configuration.nix b/m/tent/configuration.nix index 416d8df1..9d507b41 100644 --- a/m/tent/configuration.nix +++ b/m/tent/configuration.nix @@ -15,6 +15,7 @@ ../hut/msmtp.nix ../module/p.nix ../module/vpn-dac.nix + ../module/hut-substituter.nix ]; # Select the this using the ID to avoid mismatches diff --git a/m/weasel/configuration.nix b/m/weasel/configuration.nix index 43ee7358..995d0fd1 100644 --- a/m/weasel/configuration.nix +++ b/m/weasel/configuration.nix @@ -3,6 +3,7 @@ { imports = [ ../common/ssf.nix + ../module/hut-substituter.nix ]; # Select this using the ID to avoid mismatches