+8

2configs/zerotier-ctrl.nix

View file Reviewed

··· 1 1 + { 2 2 + clan.networking.zerotier = { 3 3 + controller = { 4 4 + enable = true; 5 5 + public = false; 6 6 + }; 7 7 + }; 8 8 + }

-31

2configs/zerotier.nix

Reviewed

··· 1 1 - { pkgs, ... }: 2 2 - { 3 3 - clan.networking.zerotier = { 4 4 - controller = { 5 5 - enable = true; 6 6 - public = false; 7 7 - }; 8 8 - }; 9 9 - environment.systemPackages = [ 10 10 - # pkgs.zerocli 11 11 - pkgs.jq 12 12 - (pkgs.writers.writeDashBin "zt-member-ls" '' 13 13 - set -eu 14 14 - NETWORK_ID=''${NETWORK_ID:-$(zerotier-cli listnetworks -j | jq -r '.[0] | .id')} 15 15 - cat /var/lib/zerotier-one/controller.d/network/$NETWORK_ID/member/* | jq -s 16 16 - '') 17 17 - (pkgs.writers.writeDashBin "zt-member-auth" '' 18 18 - set -efux 19 19 - MEMBER_ID=$1 20 20 - if ! printf '%s' $MEMBER_ID | grep -q '^[0-9a-f]\{10\}$'; then 21 21 - echo '$MEMBER_ID is not a valid member id' 22 22 - exit 1 23 23 - fi 24 24 - URL='http://localhost:9993/controller/' 25 25 - TOKEN=''${TOKEN:-$(cat /var/lib/zerotier-one/authtoken.secret)} 26 26 - NETWORK_ID=''${NETWORK_ID:-$(zerotier-cli listnetworks -j | jq -r '.[0] | .id')} 27 27 - 28 28 - curl -fSs -H "X-ZT1-AUTH: $TOKEN" "$URL/network/$NETWORK_ID/member/$MEMBER_ID" -d '{"authorized": true}' 29 29 - '') 30 30 - ]; 31 31 - }

+1 -1

machines/green/config.nix

View file Reviewed

··· 19 19 20 20 ../../2configs/atuin-server.nix 21 21 22 22 - ../../2configs/zerotier.nix 22 22 + ../../2configs/zerotier-ctrl.nix 23 23 ]; 24 24 25 25 clanCore.secretsUploadDirectory = lib.mkForce "/var/state/secrets";