From f565b56a5e77fd18a426e9d02cf647b8f5a0a60c Mon Sep 17 00:00:00 2001 From: Petru Paler Date: Mon, 5 Aug 2024 06:29:40 +0100 Subject: [PATCH] Don't run nomad on chilly. --- common/base-node.nix | 13 +++++++++++++ common/compute-node.nix | 9 +-------- hosts/chilly/default.nix | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 common/base-node.nix diff --git a/common/base-node.nix b/common/base-node.nix new file mode 100644 index 0000000..a6e1125 --- /dev/null +++ b/common/base-node.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + imports = [ + ./cifs-client.nix + ./consul.nix + ./glusterfs-client.nix + ./impermanence.nix + ./sshd.nix + ./user-ppetru.nix + ./unattended-encryption.nix + ./systemd-boot.nix + ]; +} diff --git a/common/compute-node.nix b/common/compute-node.nix index 81b1638..4b8fb18 100644 --- a/common/compute-node.nix +++ b/common/compute-node.nix @@ -1,16 +1,9 @@ { pkgs, ... }: { imports = [ - ./cifs-client.nix - ./consul.nix + ./base-node.nix ./glusterfs.nix - ./glusterfs-client.nix - ./impermanence.nix ./nomad.nix - ./sshd.nix - ./user-ppetru.nix - ./unattended-encryption.nix ./syncthing-data.nix - ./systemd-boot.nix ]; } diff --git a/hosts/chilly/default.nix b/hosts/chilly/default.nix index 82bbb18..afd1049 100644 --- a/hosts/chilly/default.nix +++ b/hosts/chilly/default.nix @@ -2,7 +2,7 @@ { imports = [ ../../common/global - ../../common/compute-node.nix + ../../common/base-node.nix ./disk-config.nix ./hardware.nix ];