From ff27a2de9df2dc5035b7ef01b655926432ff7aef Mon Sep 17 00:00:00 2001 From: kurogeek Date: Tue, 16 Jun 2026 13:10:16 +0700 Subject: [PATCH] mob next [ci-skip] [ci skip] [skip ci] lastFile:inventories/default.nix --- inventories/default.nix | 16 ++++++++++++++-- machines/rigel/configuration.nix | 10 ---------- machines/vega/configuration.nix | 7 ------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/inventories/default.nix b/inventories/default.nix index 0d18394..d4c3d19 100644 --- a/inventories/default.nix +++ b/inventories/default.nix @@ -102,7 +102,13 @@ name = "zerotier"; input = "clan-core"; }; - roles.controller.machines."vega" = { }; + roles.controller.machines."vega" = { + settings.allowedIds = [ + "dbe44c0287" # Alex-gateway + "b0e0b84fd3" # Alex + "2bd36db8cc" # kurogeek-thinkpad + ]; + }; roles.peer.tags.glom = { }; }; @@ -111,7 +117,13 @@ name = "zerotier"; input = "clan-core"; }; - roles.controller.machines."rigel" = { }; + roles.controller.machines."rigel" = { + settings.allowedIds = [ + "dbe44c0287" # Alex-gateway + "b0e0b84fd3" # Alex + "2bd36db8cc" # kurogeek-thinkpad + ]; + }; roles.peer.tags.b4l = { }; }; diff --git a/machines/rigel/configuration.nix b/machines/rigel/configuration.nix index b41c00c..2bc5190 100644 --- a/machines/rigel/configuration.nix +++ b/machines/rigel/configuration.nix @@ -1,15 +1,5 @@ { config, ... }: { - imports = [ - (import ../../lib/auto-accept-zerotier-members.nix { - memberIds = [ - "dbe44c0287" # Alex-gateway - "b0e0b84fd3" # Alex - "2bd36db8cc" # kurogeek-thinkpad - ]; - }) - ]; - system.stateVersion = "25.11"; clan.core.sops.defaultGroups = [ "admins" ]; clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]"; diff --git a/machines/vega/configuration.nix b/machines/vega/configuration.nix index 1f7cf89..7b304c4 100644 --- a/machines/vega/configuration.nix +++ b/machines/vega/configuration.nix @@ -10,13 +10,6 @@ (inputs.import-tree ./services) - (import ../../lib/auto-accept-zerotier-members.nix { - memberIds = [ - "dbe44c0287" # Alex-gateway - "b0e0b84fd3" # Alex - "2bd36db8cc" # kurogeek-thinkpad - ]; - }) ]; clan.core.sops.defaultGroups = [ "admins" ];