aboutsummaryrefslogtreecommitdiff
path: root/cluster
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2024-04-20 10:09:55 +0200
committerAlex Auvolat <alex@adnab.me>2024-04-20 10:09:55 +0200
commitc6a1bb341fddfd38c8c826c796a21ac8efcbfb4c (patch)
tree768eda2d3e81b8cde6b6edc9268578cb3ca87f36 /cluster
parenteddc95c5df810cb8a23235060915907a57c4913e (diff)
downloadnixcfg-c6a1bb341fddfd38c8c826c796a21ac8efcbfb4c.tar.gz
nixcfg-c6a1bb341fddfd38c8c826c796a21ac8efcbfb4c.zip
prod: update nixos to 23.05
Diffstat (limited to 'cluster')
-rw-r--r--cluster/prod/cluster.nix3
-rw-r--r--cluster/staging/cluster.nix2
2 files changed, 4 insertions, 1 deletions
diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix
index 278f3cf..ab3395e 100644
--- a/cluster/prod/cluster.nix
+++ b/cluster/prod/cluster.nix
@@ -77,6 +77,9 @@
};
};
+ # Keep using Nomad 1.4
+ services.nomad.package = pkgs.nomad_1_4;
+
# Bootstrap IPs for Consul cluster,
# these are IPs on the Wireguard overlay
services.consul.extraConfig.retry_join = [
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index a76d0ce..b696ee5 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -100,7 +100,7 @@
## ===== EXPERIMENTAL SECTION FOR STAGING CLUSTER =====
# 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
# We're doing lots of experiments so GC periodically is usefull.