aboutsummaryrefslogtreecommitdiff
path: root/cluster
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2024-04-20 10:58:36 +0200
committerAlex Auvolat <alex@adnab.me>2024-04-20 10:58:36 +0200
commit972fc4ea7c48db9dc0a2aad52f7966f0e3b26256 (patch)
tree20f2de98bea4c66a300e5a9f3f30c0c22b75b7cb /cluster
parent444306aa548bded7d67b95fe02dddeef1d0d347e (diff)
downloadnixcfg-972fc4ea7c48db9dc0a2aad52f7966f0e3b26256.tar.gz
nixcfg-972fc4ea7c48db9dc0a2aad52f7966f0e3b26256.zip
prod: nixos 23.11 and nomad 1.5
Diffstat (limited to 'cluster')
-rw-r--r--cluster/prod/cluster.nix5
-rw-r--r--cluster/staging/cluster.nix1
2 files changed, 3 insertions, 3 deletions
diff --git a/cluster/prod/cluster.nix b/cluster/prod/cluster.nix
index ab3395e..52a9bd7 100644
--- a/cluster/prod/cluster.nix
+++ b/cluster/prod/cluster.nix
@@ -77,8 +77,9 @@
};
};
- # Keep using Nomad 1.4
- services.nomad.package = pkgs.nomad_1_4;
+ # Pin Nomad version
+ services.nomad.package = pkgs.nomad_1_5;
+ nixpkgs.config.allowUnfree = true; # Accept nomad's BSL license
# Bootstrap IPs for Consul cluster,
# these are IPs on the Wireguard overlay
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index b696ee5..184092f 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -109,7 +109,6 @@
imports = [
## ---- Nix Nomad jobs using nomad-driver-nix2 ----
({ pkgs, ... }: {
- services.nomad.dropPrivileges = false;
services.nomad.extraSettingsPlugins = [
(import ./nomad-driver-nix2.nix { inherit pkgs; })
];