From 7883307136a18767e461563cad8d7f65de3a2fe2 Mon Sep 17 00:00:00 2001
From: Xyon <xyon@orbiter-radio.uk>
Date: Tue, 8 Oct 2024 18:36:05 +0100
Subject: [PATCH] More work on multi-deployment

---
 .gitea/workflows/deploy.yaml | 8 +++-----
 Cargo.lock                   | 5 +++--
 cicd/deploy.sh               | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 8aebb49..019c888 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -15,10 +15,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Pre-seed known_hosts (Badgey)
-        run: mkdir -pv ~/.ssh && ssh-keyscan -t rsa badgey >> ~/.ssh/known_hosts
-      - name: Pre-seed known_hosts (M5)
-        run: mkdir -pv ~/.ssh && ssh-keyscan -t rsa m5-computer >> ~/.ssh/known_hosts
       - name: Build (Release)
         run: cargo build --release --color=always
       - name: Archive artifact
@@ -54,7 +50,9 @@ jobs:
           WEATHER_API_KEY: ${{ secrets.WEATHER_API_KEY }}
           DOGPICS_API_KEY: ${{ secrets.DOGPICS_API_KEY }}
           CATPICS_API_KEY: ${{ secrets.CATPICS_API_KEY }}
+      - name: Pre-seed known_hosts
+        run: mkdir -pv ~/.ssh && ssh-keyscan -t rsa ${{ vars[format('{0}_SERVER_HOSTNAME', matrix.bot) }} >> ~/.ssh/known_hosts
       - name: Seed SSH key for deploy
         run: echo "${{ secrets.DEPLOY_KEY }}" | tr -d '\r' > ~/.ssh/id_rsa && chmod 0600 ~/.ssh/id_rsa
       - name: Deploy
-        run: bash cicd/deploy.sh ${{ matrix.bot }}
+        run: bash cicd/deploy.sh ${{ vars[format('{0}_SERVER_HOSTNAME', matrix.bot) }}
diff --git a/Cargo.lock b/Cargo.lock
index a8d1628..206176b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -172,7 +172,7 @@ dependencies = [
 
 [[package]]
 name = "badgey"
-version = "4.0.0"
+version = "4.1.0"
 dependencies = [
  "built",
  "clap",
@@ -1268,7 +1268,8 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "manifold"
-version = "6.0.0"
+version = "6.1.0"
+source = "git+https://code.orbiter-radio.uk/discord/manifold.git#4e60cef97ab6395afb139ee24f9240237593d032"
 dependencies = [
  "built",
  "chrono",
diff --git a/cicd/deploy.sh b/cicd/deploy.sh
index 3177e7c..2f0c078 100755
--- a/cicd/deploy.sh
+++ b/cicd/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-bot=$(echo "$1" | tr '[:upper:]' '[:lower:]')
+bot=$1
 
 ssh badgey@$bot sudo /usr/bin/systemctl stop $bot
 rsync -avP badgey badgey@$bot:/srv/$bot/