From 91d2b7cedbe3f496edb7ef11e469666319db07c9 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Fri, 26 Jan 2024 20:43:09 -0500 Subject: [PATCH] feat(cluster): add hosts and change group name --- devices/cluster/default.nix | 4 ++++ devices/cluster/modules/pacemaker.nix | 10 +++++----- flake.lock | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/devices/cluster/default.nix b/devices/cluster/default.nix index 59a844d..08d6578 100644 --- a/devices/cluster/default.nix +++ b/devices/cluster/default.nix @@ -46,6 +46,10 @@ in { clusterIP "1.0.0.1" ]; + extraHosts = '' + 10.0.0.244 thingone + 10.0.0.159 thingtwo + ''; firewall.enable = false; }; diff --git a/devices/cluster/modules/pacemaker.nix b/devices/cluster/modules/pacemaker.nix index 8036729..a9f6ee3 100644 --- a/devices/cluster/modules/pacemaker.nix +++ b/devices/cluster/modules/pacemaker.nix @@ -26,32 +26,32 @@ in { "caddy-vip" = { ip = "10.0.0.130"; interface = "eno1"; - group = "caddy"; + group = "caddy-grp"; }; }; systemdResources = { "caddy" = { enable = true; - group = "caddy"; + group = "caddy-grp"; startAfter = ["caddy-vip"]; }; "unbound" = { enable = true; - group = "caddy"; + group = "caddy-grp"; startAfter = ["caddy"]; }; "blocky" = { enable = true; - group = "caddy"; + group = "caddy-grp"; startAfter = ["unbound"]; }; "headscale" = { enable = true; - group = "caddy"; + group = "caddy-grp"; startAfter = ["blocky"]; }; }; diff --git a/flake.lock b/flake.lock index 3a9d3ad..ec748fb 100644 --- a/flake.lock +++ b/flake.lock @@ -1044,11 +1044,11 @@ "nixpkgs-pacemaker": "nixpkgs-pacemaker" }, "locked": { - "lastModified": 1706296989, - "narHash": "sha256-qpaRjqvPVio4T3qV6Hws1kr1ohwY+Dhx82KFEPeSiLU=", + "lastModified": 1706319439, + "narHash": "sha256-bsKLDWLv+jCsQ4ToNkDwJT1tbJusekVzE84nRRX3Zko=", "owner": "matt1432", "repo": "nixos-pacemaker", - "rev": "f819e743d2e2329f7c306978a5ea084955c0364d", + "rev": "09659272afc0790e08d19b608aaa4a06eb989803", "type": "github" }, "original": {