Check in the keys for both accounts

The keys of the people who deploy are in the repository now: in home/ for
the root user and in admin/ for the Administrator. The resources mirror
both home directories, and the deploy script no longer reads any private
key.

Co-Authored-By: Claude Code <noreply@anthropic.com>

server/scripts/deploy.sh

@@ -6,13 +6,13 @@
 # The job runs on the box as SYSTEM, never as the root user. The Administrator account sets it up; its shell is a
 # Windows one, so the commands we run there are Windows commands.
 #
-# The Administrator logs in with the personal key of the deployer, by default ~/.ssh/id_ed25519. The key of the
-# website never gets administrator rights: it only logs in as the root user.
+# The Administrator logs in with the personal key of the deployer, from the agent or from -i. The key of the website
+# never gets administrator rights: it only logs in as the root user.
 set -euo pipefail
 
 HOST=nowhere.wirs.ing
 USER=Administrator
-KEYFILE="$HOME/.ssh/id_ed25519"
+KEYFILE=''
 UNINSTALL=0
 
 while [ $# -gt 0 ]; do
@@ -30,11 +30,6 @@ remote='C:\Users\Administrator\kik'   # where the installer is put, in the home
 remotePath='/c/Users\Administrator\kik'   # the same place, as the file transfer sees it
 temporary=()
 
-if [ ! -f "$KEYFILE" ]; then
-    echo "no key file for the login as $USER: $KEYFILE" >&2
-    exit 1
-fi
-
 # The host key is the one the website pins, so that the deployment cannot be intercepted.
 expected=$(sed -n "s/.*const HOST_KEY = '\([^']*\)'.*/\1/p" "$repo/src/scripts/terminal.ts")
 known=$(mktemp)
@@ -47,19 +42,15 @@ if [ "$actual" != "$expected" ]; then
     exit 1
 fi
 
-# The site logs in with the key in the authorized_keys of the user on the box, so the two have to be the same.
-site=$(mktemp)
-chmod 600 "$site"
-temporary+=("$site")
-boring=$(sed -n "s/.*const boringData = '\([^']*\)'.*/\1/p" "$repo/src/scripts/terminal.ts")
-printf '%s' "$boring" | base64 -d | tr 'A-Za-z' 'N-ZA-Mn-za-m' > "$site"
-public=$(ssh-keygen -y -f "$site" | awk 'NF {print $1" "$2}')
-if ! awk 'NF {print $1" "$2}' "$server/resources/.ssh/authorized_keys" | grep -qxF "$public"; then
-    echo "the key in server/resources/.ssh/authorized_keys is not the one the website uses" >&2
+# The site logs in with the first key in the authorized_keys of the user on the box, so it has to be the right one.
+sitekey=$(ssh-keygen -lf "$server/resources/home/.ssh/authorized_keys" | awk 'NR==1 {print $2}')
+if [ "$sitekey" != 'SHA256:KUEv4d4+75h41l0OGTWCA2FbtEOQZ047ujkeh+kkFW0' ]; then
+    echo "the key of the website is not the first one in server/resources/home/.ssh/authorized_keys" >&2
     exit 1
 fi
 
-options=(-i "$KEYFILE" -o "UserKnownHostsFile=$known" -o StrictHostKeyChecking=yes)
+options=(-o "UserKnownHostsFile=$known" -o StrictHostKeyChecking=yes)
+if [ -n "$KEYFILE" ]; then options+=(-i "$KEYFILE"); fi
 ssh=(ssh "${options[@]}" "$USER@$HOST")
 scp=(scp "${options[@]}")
 
@@ -68,13 +59,9 @@ if [ "$UNINSTALL" = 1 ]; then
     exit
 fi
 
-# The installer looks for the resources next to itself, so both directories go to the server.
-"${ssh[@]}" "if not exist $remote mkdir $remote"
+# The installer looks for the resources next to itself, so both directories go to the server. What was there
+# before is removed, so that files that are gone from the repository do not stay on the box.
+"${ssh[@]}" "if exist $remote rmdir /s /q $remote"
+"${ssh[@]}" "mkdir $remote"
 "${scp[@]}" -r "$server/scripts" "$server/resources" "$USER@$HOST:$remotePath/"
 "${ssh[@]}" "powershell -NoProfile -ExecutionPolicy Bypass -File $remote\\scripts\\install_restore_task.ps1"
-
-# The Administrator logs in with the key of the deployer, so that it is there after every deployment.
-keyline=$(ssh-keygen -y -f "$KEYFILE")
-blob=$(echo "$keyline" | awk 'NF {print $2}')
-"${ssh[@]}" "if not exist C:\\Users\\Administrator\\.ssh mkdir C:\\Users\\Administrator\\.ssh"
-"${ssh[@]}" "findstr /c:\"$blob\" C:\\Users\\Administrator\\.ssh\\authorized_keys >nul 2>&1 || echo $keyline >> C:\\Users\\Administrator\\.ssh\\authorized_keys"