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

prod: nixos 23.11 and nomad 1.5

Browse source
This commit is contained in:
Alex 2024-04-20 10:58:36 +02:00
parent 444306aa54
commit 972fc4ea7c
5 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cluster/prod/cluster.nix
View file

@ -77,8 +77,9 @@
}; };
}; };
# Keep using Nomad 1.4 # Pin Nomad version
services.nomad.package = pkgs.nomad_1_4; services.nomad.package = pkgs.nomad_1_5;
nixpkgs.config.allowUnfree = true; # Accept nomad's BSL license
# Bootstrap IPs for Consul cluster, # Bootstrap IPs for Consul cluster,
# these are IPs on the Wireguard overlay # these are IPs on the Wireguard overlay

1
cluster/staging/cluster.nix
View file

@ -109,7 +109,6 @@
imports = [ imports = [
## ---- Nix Nomad jobs using nomad-driver-nix2 ---- ## ---- Nix Nomad jobs using nomad-driver-nix2 ----
({ pkgs, ... }: { ({ pkgs, ... }: {
services.nomad.dropPrivileges = false;
services.nomad.extraSettingsPlugins = [ services.nomad.extraSettingsPlugins = [
(import ./nomad-driver-nix2.nix { inherit pkgs; }) (import ./nomad-driver-nix2.nix { inherit pkgs; })
]; ];

3
deploy_pki
View file

@ -27,9 +27,6 @@ for file in nomad-ca.crt nomad$YEAR.crt nomad$YEAR.key \
do do
if pass $PKI/$file >/dev/null; then if pass $PKI/$file >/dev/null; then
write_pass $PKI/$file /var/lib/nomad/pki/$file write_pass $PKI/$file /var/lib/nomad/pki/$file
if [ ! "$CLUSTER" = "staging" ]; then
cmd "chown \$(stat -c %u /var/lib/private/nomad/) /var/lib/nomad/pki/$file"
fi
fi fi
done done

1
nix/deuxfleurs.nix
View file

@ -330,6 +330,7 @@ in
}; };
services.nomad.enable = true; services.nomad.enable = true;
services.nomad.dropPrivileges = false; # required starting with Nomad 1.5, otherwise Docker is not detected
systemd.services.nomad.after = [ "wg-quick-wg0.service" ]; systemd.services.nomad.after = [ "wg-quick-wg0.service" ];
services.nomad.extraPackages = [ services.nomad.extraPackages = [
pkgs.glibc pkgs.glibc

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-23.05 nixos cmd nix-channel --add https://nixos.org/channels/nixos-23.11 nixos
fi fi
cmd nix-channel --update cmd nix-channel --update