From 77b487a7099747b80477ffc09b2ddd5fcd0e9671 Mon Sep 17 00:00:00 2001 From: kurogeek Date: Tue, 16 Jun 2026 15:01:21 +0700 Subject: [PATCH] clancore bumped, zerotier migration --- flake.lock | 41 ++++++++++--------- inventories/default.nix | 16 +++++++- machines/neptune/configuration.nix | 1 - machines/ramus/configuration.nix | 1 - machines/rigel/configuration.nix | 11 ----- machines/vega/configuration.nix | 8 ---- .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/alasia | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/bosona | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/canopus | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/deneb | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/neptune | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/petra | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/ramus | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/rana | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/rigel | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/sirius | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../zerotier-identity-secret/groups/admins | 1 - .../zerotier-identity-secret/machines/vega | 1 - .../zerotier-identity-secret/users/kurogeek | 1 - .../identity-secret/groups/admins | 1 + .../identity-secret/machines/alasia | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../identity-secret/groups/admins | 1 + .../identity-secret/machines/bosona | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../identity-secret/groups/admins | 1 + .../identity-secret/machines/canopus | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../identity-secret/groups/admins | 1 + .../identity-secret/machines/deneb | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../identity-secret/groups/admins | 1 + .../identity-secret/machines/neptune | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../identity-secret/groups/admins | 1 + .../identity-secret/machines/petra | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../identity-secret/groups/admins | 1 + .../identity-secret/machines/ramus | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../identity-secret/groups/admins | 1 + .../identity-secret/machines/rana | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../identity-secret/groups/admins | 1 + .../identity-secret/machines/rigel | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../identity-secret/groups/admins | 1 + .../identity-secret/machines/sirius | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../identity-secret/groups/admins | 1 + .../identity-secret/machines/vega | 1 + .../identity-secret}/secret | 0 .../identity-secret/users/kurogeek | 1 + .../zerotier-ip-alasia-b4l-network/ip}/value | 0 .../zerotier-ip-bosona-poy-network/ip}/value | 0 .../ip}/value | 0 .../zerotier-ip-deneb-poy-network/ip}/value | 0 .../zerotier-ip-neptune-b4l-network/ip}/value | 0 .../zerotier-ip-petra-b4l-network/ip}/value | 0 .../zerotier-ip-ramus-glom-network/ip}/value | 0 .../zerotier-ip-rana-b4l-network/ip}/value | 0 .../zerotier-ip-rigel-b4l-network/ip}/value | 0 .../zerotier-ip-sirius-w-network/ip}/value | 0 .../zerotier-ip-vega-glom-network/ip}/value | 0 .../network-id}/value | 0 .../network-id}/value | 0 .../network-id}/value | 0 .../network-id}/value | 0 98 files changed, 68 insertions(+), 76 deletions(-) delete mode 120000 vars/per-machine/alasia/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/alasia/zerotier/zerotier-identity-secret/machines/alasia delete mode 120000 vars/per-machine/alasia/zerotier/zerotier-identity-secret/users/kurogeek delete mode 120000 vars/per-machine/bosona/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/bosona/zerotier/zerotier-identity-secret/machines/bosona delete mode 120000 vars/per-machine/bosona/zerotier/zerotier-identity-secret/users/kurogeek delete mode 120000 vars/per-machine/canopus/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/canopus/zerotier/zerotier-identity-secret/machines/canopus delete mode 120000 vars/per-machine/canopus/zerotier/zerotier-identity-secret/users/kurogeek delete mode 120000 vars/per-machine/deneb/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/deneb/zerotier/zerotier-identity-secret/machines/deneb delete mode 120000 vars/per-machine/deneb/zerotier/zerotier-identity-secret/users/kurogeek delete mode 120000 vars/per-machine/neptune/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/neptune/zerotier/zerotier-identity-secret/machines/neptune delete mode 120000 vars/per-machine/neptune/zerotier/zerotier-identity-secret/users/kurogeek delete mode 120000 vars/per-machine/petra/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/petra/zerotier/zerotier-identity-secret/machines/petra delete mode 120000 vars/per-machine/petra/zerotier/zerotier-identity-secret/users/kurogeek delete mode 120000 vars/per-machine/ramus/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/ramus/zerotier/zerotier-identity-secret/machines/ramus delete mode 120000 vars/per-machine/ramus/zerotier/zerotier-identity-secret/users/kurogeek delete mode 120000 vars/per-machine/rana/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/rana/zerotier/zerotier-identity-secret/machines/rana delete mode 120000 vars/per-machine/rana/zerotier/zerotier-identity-secret/users/kurogeek delete mode 120000 vars/per-machine/rigel/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/rigel/zerotier/zerotier-identity-secret/machines/rigel delete mode 120000 vars/per-machine/rigel/zerotier/zerotier-identity-secret/users/kurogeek delete mode 120000 vars/per-machine/sirius/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/sirius/zerotier/zerotier-identity-secret/machines/sirius delete mode 120000 vars/per-machine/sirius/zerotier/zerotier-identity-secret/users/kurogeek delete mode 120000 vars/per-machine/vega/zerotier/zerotier-identity-secret/groups/admins delete mode 120000 vars/per-machine/vega/zerotier/zerotier-identity-secret/machines/vega delete mode 120000 vars/per-machine/vega/zerotier/zerotier-identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-alasia/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-alasia/identity-secret/machines/alasia rename vars/{per-machine/alasia/zerotier/zerotier-identity-secret => shared/zerotier-identity-alasia/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-alasia/identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-bosona/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-bosona/identity-secret/machines/bosona rename vars/{per-machine/bosona/zerotier/zerotier-identity-secret => shared/zerotier-identity-bosona/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-bosona/identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-canopus/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-canopus/identity-secret/machines/canopus rename vars/{per-machine/canopus/zerotier/zerotier-identity-secret => shared/zerotier-identity-canopus/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-canopus/identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-deneb/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-deneb/identity-secret/machines/deneb rename vars/{per-machine/deneb/zerotier/zerotier-identity-secret => shared/zerotier-identity-deneb/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-deneb/identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-neptune/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-neptune/identity-secret/machines/neptune rename vars/{per-machine/neptune/zerotier/zerotier-identity-secret => shared/zerotier-identity-neptune/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-neptune/identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-petra/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-petra/identity-secret/machines/petra rename vars/{per-machine/petra/zerotier/zerotier-identity-secret => shared/zerotier-identity-petra/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-petra/identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-ramus/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-ramus/identity-secret/machines/ramus rename vars/{per-machine/ramus/zerotier/zerotier-identity-secret => shared/zerotier-identity-ramus/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-ramus/identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-rana/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-rana/identity-secret/machines/rana rename vars/{per-machine/rana/zerotier/zerotier-identity-secret => shared/zerotier-identity-rana/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-rana/identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-rigel/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-rigel/identity-secret/machines/rigel rename vars/{per-machine/rigel/zerotier/zerotier-identity-secret => shared/zerotier-identity-rigel/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-rigel/identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-sirius/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-sirius/identity-secret/machines/sirius rename vars/{per-machine/sirius/zerotier/zerotier-identity-secret => shared/zerotier-identity-sirius/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-sirius/identity-secret/users/kurogeek create mode 120000 vars/shared/zerotier-identity-vega/identity-secret/groups/admins create mode 120000 vars/shared/zerotier-identity-vega/identity-secret/machines/vega rename vars/{per-machine/vega/zerotier/zerotier-identity-secret => shared/zerotier-identity-vega/identity-secret}/secret (100%) create mode 120000 vars/shared/zerotier-identity-vega/identity-secret/users/kurogeek rename vars/{per-machine/alasia/zerotier/zerotier-ip => shared/zerotier-ip-alasia-b4l-network/ip}/value (100%) rename vars/{per-machine/bosona/zerotier/zerotier-ip => shared/zerotier-ip-bosona-poy-network/ip}/value (100%) rename vars/{per-machine/canopus/zerotier/zerotier-ip => shared/zerotier-ip-canopus-glom-network/ip}/value (100%) rename vars/{per-machine/deneb/zerotier/zerotier-ip => shared/zerotier-ip-deneb-poy-network/ip}/value (100%) rename vars/{per-machine/neptune/zerotier/zerotier-ip => shared/zerotier-ip-neptune-b4l-network/ip}/value (100%) rename vars/{per-machine/petra/zerotier/zerotier-ip => shared/zerotier-ip-petra-b4l-network/ip}/value (100%) rename vars/{per-machine/ramus/zerotier/zerotier-ip => shared/zerotier-ip-ramus-glom-network/ip}/value (100%) rename vars/{per-machine/rana/zerotier/zerotier-ip => shared/zerotier-ip-rana-b4l-network/ip}/value (100%) rename vars/{per-machine/rigel/zerotier/zerotier-ip => shared/zerotier-ip-rigel-b4l-network/ip}/value (100%) rename vars/{per-machine/sirius/zerotier/zerotier-ip => shared/zerotier-ip-sirius-w-network/ip}/value (100%) rename vars/{per-machine/vega/zerotier/zerotier-ip => shared/zerotier-ip-vega-glom-network/ip}/value (100%) rename vars/{per-machine/rigel/zerotier/zerotier-network-id => shared/zerotier-network-b4l-network/network-id}/value (100%) rename vars/{per-machine/vega/zerotier/zerotier-network-id => shared/zerotier-network-glom-network/network-id}/value (100%) rename vars/{per-machine/deneb/zerotier/zerotier-network-id => shared/zerotier-network-poy-network/network-id}/value (100%) rename vars/{per-machine/sirius/zerotier/zerotier-network-id => shared/zerotier-network-w-network/network-id}/value (100%) diff --git a/flake.lock b/flake.lock index 82246d0..d0e9642 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1772411144, - "narHash": "sha256-WhXudztwPNnKXaqGX4DOqNfHzHdBSiGCvKGHM20pscw=", + "lastModified": 1781517972, + "narHash": "sha256-G8bIXFqifs/y62GNPwg20Ksf71raYwzmyN99gf1tXak=", "ref": "refs/heads/main", - "rev": "92cc85bc24eb31ce5725e1e72753129810ce3fe9", - "revCount": 13201, + "rev": "7fc62d0c25c7a97d7027a9c248e21c97c9b3acc1", + "revCount": 14604, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1772273147, - "narHash": "sha256-Wzhoc6ifjTDZi8aVRH3fuLJPdd4ouNTTwwVhgoMcMek=", - "rev": "d5de7a8d9e5726e678c94e62fe8ac3a809fee5da", + "lastModified": 1778718524, + "narHash": "sha256-pXLoI6Ax0EnUK6r34UM1vibVC7CfTu6j72R2692ZzPs=", + "rev": "12c552ad547d87254f33f33bddd1a2cdbeac754d", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/d5de7a8d9e5726e678c94e62fe8ac3a809fee5da.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/12c552ad547d87254f33f33bddd1a2cdbeac754d.tar.gz" }, "original": { "type": "tarball", @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1771881364, - "narHash": "sha256-A5uE/hMium5of/QGC6JwF5TGoDAfpNtW00T0s9u/PN8=", + "lastModified": 1781152676, + "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", "owner": "nix-community", "repo": "disko", - "rev": "a4cb7bf73f264d40560ba527f9280469f1f081c6", + "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", "type": "github" }, "original": { @@ -484,11 +484,11 @@ ] }, "locked": { - "lastModified": 1772379624, - "narHash": "sha256-NG9LLTWlz4YiaTAiRGChbrzbVxBfX+Auq4Ab/SWmk4A=", + "lastModified": 1781242433, + "narHash": "sha256-bchLZZ3sRn740zyvD2icZSnNoTaanN0nw7l6fjVXO+E=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "52d061516108769656a8bd9c6e811c677ec5b462", + "rev": "aabb2037edfc0f210723b72cd5f528aab5dd3f0b", "type": "github" }, "original": { @@ -673,11 +673,11 @@ ] }, "locked": { - "lastModified": 1772340640, - "narHash": "sha256-1nq7+Kt5IUBD8Hu3nptVPbMf+22rNJoHT0t9L1X+GKA=", + "lastModified": 1780547341, + "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "dec4d8eac700dcd2fe3c020857d3ee220ec147f1", + "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", "type": "github" }, "original": { @@ -764,15 +764,16 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1774449309, + "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", "owner": "nix-systems", "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", "type": "github" }, "original": { "owner": "nix-systems", + "ref": "future-26.11", "repo": "default", "type": "github" } 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/neptune/configuration.nix b/machines/neptune/configuration.nix index 56de921..a1efa89 100644 --- a/machines/neptune/configuration.nix +++ b/machines/neptune/configuration.nix @@ -10,7 +10,6 @@ }; system.stateVersion = "25.11"; clan.core.sops.defaultGroups = [ "admins" ]; - clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]"; networking.interfaces.enx00e04c106368.useDHCP = true; # recovery diff --git a/machines/ramus/configuration.nix b/machines/ramus/configuration.nix index 7b45278..2803561 100644 --- a/machines/ramus/configuration.nix +++ b/machines/ramus/configuration.nix @@ -9,7 +9,6 @@ clan.core.settings.machine.description = "A Hetzner VPS machine own by Alex."; clan.core.sops.defaultGroups = [ "admins" ]; - clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]"; clan.core.vars.generators.acme = { share = true; diff --git a/machines/rigel/configuration.nix b/machines/rigel/configuration.nix index b41c00c..973f8a6 100644 --- a/machines/rigel/configuration.nix +++ b/machines/rigel/configuration.nix @@ -1,18 +1,7 @@ { 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}]"; clan.core.settings.machine.description = "Zima board computer for testing in B4L"; } diff --git a/machines/vega/configuration.nix b/machines/vega/configuration.nix index 1f7cf89..ba14e77 100644 --- a/machines/vega/configuration.nix +++ b/machines/vega/configuration.nix @@ -10,17 +10,9 @@ (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" ]; - clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]"; clan.core.settings.machine.description = "Glom NAS"; diff --git a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/alasia/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/machines/alasia b/vars/per-machine/alasia/zerotier/zerotier-identity-secret/machines/alasia deleted file mode 120000 index 9f1fd15..0000000 --- a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/machines/alasia +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/alasia \ No newline at end of file diff --git a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/alasia/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/bosona/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/machines/bosona b/vars/per-machine/bosona/zerotier/zerotier-identity-secret/machines/bosona deleted file mode 120000 index 29a0f55..0000000 --- a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/machines/bosona +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/bosona \ No newline at end of file diff --git a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/bosona/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/canopus/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/machines/canopus b/vars/per-machine/canopus/zerotier/zerotier-identity-secret/machines/canopus deleted file mode 120000 index 4f5de1b..0000000 --- a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/machines/canopus +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/canopus \ No newline at end of file diff --git a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/canopus/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/deneb/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/machines/deneb b/vars/per-machine/deneb/zerotier/zerotier-identity-secret/machines/deneb deleted file mode 120000 index b8f3750..0000000 --- a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/machines/deneb +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/deneb \ No newline at end of file diff --git a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/deneb/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/neptune/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/machines/neptune b/vars/per-machine/neptune/zerotier/zerotier-identity-secret/machines/neptune deleted file mode 120000 index f1f22e2..0000000 --- a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/machines/neptune +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/neptune \ No newline at end of file diff --git a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/neptune/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/petra/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/petra/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/petra/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/petra/zerotier/zerotier-identity-secret/machines/petra b/vars/per-machine/petra/zerotier/zerotier-identity-secret/machines/petra deleted file mode 120000 index 7a72f2e..0000000 --- a/vars/per-machine/petra/zerotier/zerotier-identity-secret/machines/petra +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/petra \ No newline at end of file diff --git a/vars/per-machine/petra/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/petra/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/petra/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/ramus/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/machines/ramus b/vars/per-machine/ramus/zerotier/zerotier-identity-secret/machines/ramus deleted file mode 120000 index 21115e2..0000000 --- a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/machines/ramus +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/ramus \ No newline at end of file diff --git a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/ramus/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/rana/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/rana/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/rana/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/rana/zerotier/zerotier-identity-secret/machines/rana b/vars/per-machine/rana/zerotier/zerotier-identity-secret/machines/rana deleted file mode 120000 index 215fc5f..0000000 --- a/vars/per-machine/rana/zerotier/zerotier-identity-secret/machines/rana +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/rana \ No newline at end of file diff --git a/vars/per-machine/rana/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/rana/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/rana/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/rigel/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/machines/rigel b/vars/per-machine/rigel/zerotier/zerotier-identity-secret/machines/rigel deleted file mode 120000 index 47a146c..0000000 --- a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/machines/rigel +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/rigel \ No newline at end of file diff --git a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/rigel/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/sirius/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/machines/sirius b/vars/per-machine/sirius/zerotier/zerotier-identity-secret/machines/sirius deleted file mode 120000 index 3c4ffbf..0000000 --- a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/machines/sirius +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/sirius \ No newline at end of file diff --git a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/sirius/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/vega/zerotier/zerotier-identity-secret/groups/admins b/vars/per-machine/vega/zerotier/zerotier-identity-secret/groups/admins deleted file mode 120000 index 6765aa1..0000000 --- a/vars/per-machine/vega/zerotier/zerotier-identity-secret/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/per-machine/vega/zerotier/zerotier-identity-secret/machines/vega b/vars/per-machine/vega/zerotier/zerotier-identity-secret/machines/vega deleted file mode 120000 index f8a757c..0000000 --- a/vars/per-machine/vega/zerotier/zerotier-identity-secret/machines/vega +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/vega \ No newline at end of file diff --git a/vars/per-machine/vega/zerotier/zerotier-identity-secret/users/kurogeek b/vars/per-machine/vega/zerotier/zerotier-identity-secret/users/kurogeek deleted file mode 120000 index 970aefa..0000000 --- a/vars/per-machine/vega/zerotier/zerotier-identity-secret/users/kurogeek +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-alasia/identity-secret/groups/admins b/vars/shared/zerotier-identity-alasia/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-alasia/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-alasia/identity-secret/machines/alasia b/vars/shared/zerotier-identity-alasia/identity-secret/machines/alasia new file mode 120000 index 0000000..67f0481 --- /dev/null +++ b/vars/shared/zerotier-identity-alasia/identity-secret/machines/alasia @@ -0,0 +1 @@ +../../../../../sops/machines/alasia \ No newline at end of file diff --git a/vars/per-machine/alasia/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-alasia/identity-secret/secret similarity index 100% rename from vars/per-machine/alasia/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-alasia/identity-secret/secret diff --git a/vars/shared/zerotier-identity-alasia/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-alasia/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-alasia/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-bosona/identity-secret/groups/admins b/vars/shared/zerotier-identity-bosona/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-bosona/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-bosona/identity-secret/machines/bosona b/vars/shared/zerotier-identity-bosona/identity-secret/machines/bosona new file mode 120000 index 0000000..8a0c95e --- /dev/null +++ b/vars/shared/zerotier-identity-bosona/identity-secret/machines/bosona @@ -0,0 +1 @@ +../../../../../sops/machines/bosona \ No newline at end of file diff --git a/vars/per-machine/bosona/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-bosona/identity-secret/secret similarity index 100% rename from vars/per-machine/bosona/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-bosona/identity-secret/secret diff --git a/vars/shared/zerotier-identity-bosona/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-bosona/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-bosona/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-canopus/identity-secret/groups/admins b/vars/shared/zerotier-identity-canopus/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-canopus/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-canopus/identity-secret/machines/canopus b/vars/shared/zerotier-identity-canopus/identity-secret/machines/canopus new file mode 120000 index 0000000..e89a7a3 --- /dev/null +++ b/vars/shared/zerotier-identity-canopus/identity-secret/machines/canopus @@ -0,0 +1 @@ +../../../../../sops/machines/canopus \ No newline at end of file diff --git a/vars/per-machine/canopus/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-canopus/identity-secret/secret similarity index 100% rename from vars/per-machine/canopus/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-canopus/identity-secret/secret diff --git a/vars/shared/zerotier-identity-canopus/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-canopus/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-canopus/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-deneb/identity-secret/groups/admins b/vars/shared/zerotier-identity-deneb/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-deneb/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-deneb/identity-secret/machines/deneb b/vars/shared/zerotier-identity-deneb/identity-secret/machines/deneb new file mode 120000 index 0000000..abd7320 --- /dev/null +++ b/vars/shared/zerotier-identity-deneb/identity-secret/machines/deneb @@ -0,0 +1 @@ +../../../../../sops/machines/deneb \ No newline at end of file diff --git a/vars/per-machine/deneb/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-deneb/identity-secret/secret similarity index 100% rename from vars/per-machine/deneb/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-deneb/identity-secret/secret diff --git a/vars/shared/zerotier-identity-deneb/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-deneb/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-deneb/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-neptune/identity-secret/groups/admins b/vars/shared/zerotier-identity-neptune/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-neptune/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-neptune/identity-secret/machines/neptune b/vars/shared/zerotier-identity-neptune/identity-secret/machines/neptune new file mode 120000 index 0000000..a786e40 --- /dev/null +++ b/vars/shared/zerotier-identity-neptune/identity-secret/machines/neptune @@ -0,0 +1 @@ +../../../../../sops/machines/neptune \ No newline at end of file diff --git a/vars/per-machine/neptune/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-neptune/identity-secret/secret similarity index 100% rename from vars/per-machine/neptune/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-neptune/identity-secret/secret diff --git a/vars/shared/zerotier-identity-neptune/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-neptune/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-neptune/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-petra/identity-secret/groups/admins b/vars/shared/zerotier-identity-petra/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-petra/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-petra/identity-secret/machines/petra b/vars/shared/zerotier-identity-petra/identity-secret/machines/petra new file mode 120000 index 0000000..21018d9 --- /dev/null +++ b/vars/shared/zerotier-identity-petra/identity-secret/machines/petra @@ -0,0 +1 @@ +../../../../../sops/machines/petra \ No newline at end of file diff --git a/vars/per-machine/petra/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-petra/identity-secret/secret similarity index 100% rename from vars/per-machine/petra/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-petra/identity-secret/secret diff --git a/vars/shared/zerotier-identity-petra/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-petra/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-petra/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-ramus/identity-secret/groups/admins b/vars/shared/zerotier-identity-ramus/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-ramus/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-ramus/identity-secret/machines/ramus b/vars/shared/zerotier-identity-ramus/identity-secret/machines/ramus new file mode 120000 index 0000000..6755b15 --- /dev/null +++ b/vars/shared/zerotier-identity-ramus/identity-secret/machines/ramus @@ -0,0 +1 @@ +../../../../../sops/machines/ramus \ No newline at end of file diff --git a/vars/per-machine/ramus/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-ramus/identity-secret/secret similarity index 100% rename from vars/per-machine/ramus/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-ramus/identity-secret/secret diff --git a/vars/shared/zerotier-identity-ramus/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-ramus/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-ramus/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-rana/identity-secret/groups/admins b/vars/shared/zerotier-identity-rana/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-rana/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-rana/identity-secret/machines/rana b/vars/shared/zerotier-identity-rana/identity-secret/machines/rana new file mode 120000 index 0000000..30a401e --- /dev/null +++ b/vars/shared/zerotier-identity-rana/identity-secret/machines/rana @@ -0,0 +1 @@ +../../../../../sops/machines/rana \ No newline at end of file diff --git a/vars/per-machine/rana/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-rana/identity-secret/secret similarity index 100% rename from vars/per-machine/rana/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-rana/identity-secret/secret diff --git a/vars/shared/zerotier-identity-rana/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-rana/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-rana/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-rigel/identity-secret/groups/admins b/vars/shared/zerotier-identity-rigel/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-rigel/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-rigel/identity-secret/machines/rigel b/vars/shared/zerotier-identity-rigel/identity-secret/machines/rigel new file mode 120000 index 0000000..ea0fd4f --- /dev/null +++ b/vars/shared/zerotier-identity-rigel/identity-secret/machines/rigel @@ -0,0 +1 @@ +../../../../../sops/machines/rigel \ No newline at end of file diff --git a/vars/per-machine/rigel/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-rigel/identity-secret/secret similarity index 100% rename from vars/per-machine/rigel/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-rigel/identity-secret/secret diff --git a/vars/shared/zerotier-identity-rigel/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-rigel/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-rigel/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-sirius/identity-secret/groups/admins b/vars/shared/zerotier-identity-sirius/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-sirius/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-sirius/identity-secret/machines/sirius b/vars/shared/zerotier-identity-sirius/identity-secret/machines/sirius new file mode 120000 index 0000000..78c64a5 --- /dev/null +++ b/vars/shared/zerotier-identity-sirius/identity-secret/machines/sirius @@ -0,0 +1 @@ +../../../../../sops/machines/sirius \ No newline at end of file diff --git a/vars/per-machine/sirius/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-sirius/identity-secret/secret similarity index 100% rename from vars/per-machine/sirius/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-sirius/identity-secret/secret diff --git a/vars/shared/zerotier-identity-sirius/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-sirius/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-sirius/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/shared/zerotier-identity-vega/identity-secret/groups/admins b/vars/shared/zerotier-identity-vega/identity-secret/groups/admins new file mode 120000 index 0000000..e7f39ba --- /dev/null +++ b/vars/shared/zerotier-identity-vega/identity-secret/groups/admins @@ -0,0 +1 @@ +../../../../../sops/groups/admins \ No newline at end of file diff --git a/vars/shared/zerotier-identity-vega/identity-secret/machines/vega b/vars/shared/zerotier-identity-vega/identity-secret/machines/vega new file mode 120000 index 0000000..f73d257 --- /dev/null +++ b/vars/shared/zerotier-identity-vega/identity-secret/machines/vega @@ -0,0 +1 @@ +../../../../../sops/machines/vega \ No newline at end of file diff --git a/vars/per-machine/vega/zerotier/zerotier-identity-secret/secret b/vars/shared/zerotier-identity-vega/identity-secret/secret similarity index 100% rename from vars/per-machine/vega/zerotier/zerotier-identity-secret/secret rename to vars/shared/zerotier-identity-vega/identity-secret/secret diff --git a/vars/shared/zerotier-identity-vega/identity-secret/users/kurogeek b/vars/shared/zerotier-identity-vega/identity-secret/users/kurogeek new file mode 120000 index 0000000..5190103 --- /dev/null +++ b/vars/shared/zerotier-identity-vega/identity-secret/users/kurogeek @@ -0,0 +1 @@ +../../../../../sops/users/kurogeek \ No newline at end of file diff --git a/vars/per-machine/alasia/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-alasia-b4l-network/ip/value similarity index 100% rename from vars/per-machine/alasia/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-alasia-b4l-network/ip/value diff --git a/vars/per-machine/bosona/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-bosona-poy-network/ip/value similarity index 100% rename from vars/per-machine/bosona/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-bosona-poy-network/ip/value diff --git a/vars/per-machine/canopus/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-canopus-glom-network/ip/value similarity index 100% rename from vars/per-machine/canopus/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-canopus-glom-network/ip/value diff --git a/vars/per-machine/deneb/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-deneb-poy-network/ip/value similarity index 100% rename from vars/per-machine/deneb/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-deneb-poy-network/ip/value diff --git a/vars/per-machine/neptune/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-neptune-b4l-network/ip/value similarity index 100% rename from vars/per-machine/neptune/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-neptune-b4l-network/ip/value diff --git a/vars/per-machine/petra/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-petra-b4l-network/ip/value similarity index 100% rename from vars/per-machine/petra/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-petra-b4l-network/ip/value diff --git a/vars/per-machine/ramus/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-ramus-glom-network/ip/value similarity index 100% rename from vars/per-machine/ramus/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-ramus-glom-network/ip/value diff --git a/vars/per-machine/rana/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-rana-b4l-network/ip/value similarity index 100% rename from vars/per-machine/rana/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-rana-b4l-network/ip/value diff --git a/vars/per-machine/rigel/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-rigel-b4l-network/ip/value similarity index 100% rename from vars/per-machine/rigel/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-rigel-b4l-network/ip/value diff --git a/vars/per-machine/sirius/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-sirius-w-network/ip/value similarity index 100% rename from vars/per-machine/sirius/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-sirius-w-network/ip/value diff --git a/vars/per-machine/vega/zerotier/zerotier-ip/value b/vars/shared/zerotier-ip-vega-glom-network/ip/value similarity index 100% rename from vars/per-machine/vega/zerotier/zerotier-ip/value rename to vars/shared/zerotier-ip-vega-glom-network/ip/value diff --git a/vars/per-machine/rigel/zerotier/zerotier-network-id/value b/vars/shared/zerotier-network-b4l-network/network-id/value similarity index 100% rename from vars/per-machine/rigel/zerotier/zerotier-network-id/value rename to vars/shared/zerotier-network-b4l-network/network-id/value diff --git a/vars/per-machine/vega/zerotier/zerotier-network-id/value b/vars/shared/zerotier-network-glom-network/network-id/value similarity index 100% rename from vars/per-machine/vega/zerotier/zerotier-network-id/value rename to vars/shared/zerotier-network-glom-network/network-id/value diff --git a/vars/per-machine/deneb/zerotier/zerotier-network-id/value b/vars/shared/zerotier-network-poy-network/network-id/value similarity index 100% rename from vars/per-machine/deneb/zerotier/zerotier-network-id/value rename to vars/shared/zerotier-network-poy-network/network-id/value diff --git a/vars/per-machine/sirius/zerotier/zerotier-network-id/value b/vars/shared/zerotier-network-w-network/network-id/value similarity index 100% rename from vars/per-machine/sirius/zerotier/zerotier-network-id/value rename to vars/shared/zerotier-network-w-network/network-id/value