tixie/nixcfg
1
0
Fork 0
forked from Deuxfleurs/nixcfg
Code Pull requests Activity

prod: update nixos to 23.05

Browse source
This commit is contained in:
Alex 2024-04-20 10:09:55 +02:00
parent eddc95c5df
commit c6a1bb341f
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cluster/prod/cluster.nix
View file

@ -77,6 +77,9 @@
}; };
}; };
# Keep using Nomad 1.4
services.nomad.package = pkgs.nomad_1_4;
# Bootstrap IPs for Consul cluster, # Bootstrap IPs for Consul cluster,
# these are IPs on the Wireguard overlay # these are IPs on the Wireguard overlay
services.consul.extraConfig.retry_join = [ services.consul.extraConfig.retry_join = [

2
cluster/staging/cluster.nix
View file

@ -100,7 +100,7 @@
## ===== EXPERIMENTAL SECTION FOR STAGING CLUSTER ===== ## ===== EXPERIMENTAL SECTION FOR STAGING CLUSTER =====
# Test nomad 1.6 # Test nomad 1.6
services.nomad.package = lib.mkForce pkgs.nomad_1_6; services.nomad.package = pkgs.nomad_1_6;
nixpkgs.config.allowUnfree = true; # Accept nomad's BSL license nixpkgs.config.allowUnfree = true; # Accept nomad's BSL license
# We're doing lots of experiments so GC periodically is usefull. # We're doing lots of experiments so GC periodically is usefull.

1
nix/deuxfleurs.nix
View file

@ -331,7 +331,6 @@ in
services.nomad.enable = true; services.nomad.enable = true;
systemd.services.nomad.after = [ "wg-quick-wg0.service" ]; systemd.services.nomad.after = [ "wg-quick-wg0.service" ];
services.nomad.package = pkgs.nomad_1_4;
services.nomad.extraPackages = [ services.nomad.extraPackages = [
pkgs.glibc pkgs.glibc
pkgs.zstd pkgs.zstd

2
upgrade_nixos
View file

@ -3,7 +3,7 @@
if [ "$CLUSTER" = "staging" ]; then if [ "$CLUSTER" = "staging" ]; then
cmd nix-channel --add https://nixos.org/channels/nixos-23.11 nixos cmd nix-channel --add https://nixos.org/channels/nixos-23.11 nixos
else else
cmd nix-channel --add https://nixos.org/channels/nixos-22.11 nixos cmd nix-channel --add https://nixos.org/channels/nixos-23.05 nixos
fi fi
cmd nix-channel --update cmd nix-channel --update