From 1d8b50de83dd4be2c8f84523e55285ec58617250 Mon Sep 17 00:00:00 2001
From: Alek Nikovich <purplebored@noreply.localhost>
Date: Thu, 30 Oct 2025 22:35:33 +0000
Subject: [PATCH] Last time I try it today.

---
 .gitea/workflows/deploy.yml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 37549c5..0614a74 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -8,45 +8,46 @@ on:
 jobs:
   deploy:
     name: Deploy website via rsync over SSH
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, linux]
 
     steps:
-      - name: 🧩 Checkout repository
+      - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: 🧠 Check required secrets
+      - name: Check required secrets
         run: |
-          echo "🧩 Checking secrets availability..."
+          echo "Checking secrets availability..."
           for var in DEPLOY_KEY DEPLOY_USER DEPLOY_HOST DEPLOY_PORT DEPLOY_PATH; do
             if [ -z "${!var}" ]; then
-              echo "❌ Secret $var is empty or undefined!" && exit 1
+              echo "Error: Secret $var is empty or undefined!" && exit 1
             else
-              echo "✅ $var present (length: ${#var})"
+              echo "Found secret $var (length: ${#var})"
             fi
           done
         shell: bash
 
-      - name: 🔐 Set up SSH key
+      - name: Set up SSH key
         run: |
-          echo "🏗️  Setting up SSH environment..."
+          echo "Setting up SSH environment..."
           mkdir -p ~/.ssh
           chmod 700 ~/.ssh
 
-          echo "🔑 Writing private key..."
-          printf "%s\n" "$DEPLOY_KEY" > ~/.ssh/id_ed25519
+          echo "Writing private key..."
+          # Rebuild key safely (handles single-line or escaped secrets)
+          echo "$DEPLOY_KEY" | tr -d '\r' | awk 'BEGIN {RS="\\n"} {print}' > ~/.ssh/id_ed25519
           chmod 600 ~/.ssh/id_ed25519
 
-          echo "📡 Adding ${DEPLOY_HOST}:${DEPLOY_PORT} to known_hosts..."
+          echo "Adding ${DEPLOY_HOST}:${DEPLOY_PORT} to known_hosts..."
           ssh-keyscan -p "$DEPLOY_PORT" -H "$DEPLOY_HOST" >> ~/.ssh/known_hosts 2>/dev/null
-          echo "✅ SSH setup complete!"
+          echo "SSH setup complete."
         shell: bash
 
-      - name: 🚀 Deploy via rsync
+      - name: Deploy via rsync
         run: |
-          echo "🚀 Starting rsync deployment..."
+          echo "Starting rsync deployment..."
           rsync -avz \
             --delete \
-            -e "ssh -i ~/.ssh/id_ed25519 -p $DEPLOY_PORT -o StrictHostKeyChecking=no" \
+            -e "ssh -i ~/.ssh/id_ed25519 -p $DEPLOY_PORT -o StrictHostKeyChecking=no -o ConnectTimeout=10" \
             ./ "${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PATH}"
-          echo "✅ Deployment finished successfully!"
+          echo "Deployment finished successfully."
         shell: bash