From cf5547e6d2151e8e50ae56db2de27e72d46df167 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 17 May 2021 19:07:17 -0400
Subject: ci/freebsd: Use an ephemeral Tailscale key

There should be no need for the shared machine key any more.
---
 .github/workflows/freebsd.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index 55e3478..2d459fb 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -12,18 +12,22 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Install dependencies
-        env:
-          SSH_KEY: ${{ secrets.SSH_KEY }}
-          TAILSCALE_KEY: ${{ secrets.TAILSCALE_KEY }}
-          TAILSCALE_MACHINE_KEY: ${{ secrets.TAILSCALE_MACHINE_KEY }}
         run: |
-          sudo mkdir /var/lib/tailscale
-          printf '%s' "$TAILSCALE_MACHINE_KEY" | sudo tee /var/lib/tailscale/tailscaled.state >/dev/null
           curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/focal.gpg | sudo apt-key add -
           curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/focal.list | sudo tee /etc/apt/sources.list.d/tailscale.list
           sudo apt-get update -y
           sudo apt-get install -y tailscale
-          sudo tailscale up --hostname=gh-runner --authkey="$TAILSCALE_KEY"
+
+      - name: Configure Tailscale
+        env:
+          TAILSCALE_KEY: ${{ secrets.TAILSCALE_KEY }}
+        run: |
+          sudo tailscale up --authkey="$TAILSCALE_KEY"
+
+      - name: Configure SSH
+        env:
+          SSH_KEY: ${{ secrets.SSH_KEY }}
+        run: |
           mkdir ~/.ssh
           printf '%s' "$SSH_KEY" >~/.ssh/github-actions
           chmod 0600 ~/.ssh/github-actions
-- 
cgit v1.2.3