From 62b7cf9324c6230a94f41e0101d35e70114dff81 Mon Sep 17 00:00:00 2001
From: Vri <vrifox@vrifox.cc>
Date: Tue, 18 Feb 2025 18:54:59 +0100
Subject: [PATCH] ci: update for new environment

---
 .woodpecker/.hugo-build.yml | 60 ++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/.woodpecker/.hugo-build.yml b/.woodpecker/.hugo-build.yml
index 2c696a0..d11bd85 100644
--- a/.woodpecker/.hugo-build.yml
+++ b/.woodpecker/.hugo-build.yml
@@ -3,45 +3,51 @@ steps:
     image: code.cozy.town/vrifox/hugoci:latest
     commands:
       - hugo --destination /woodpecker/build/ --minify --cleanDestinationDir
+    volumes:
+      - /srv/woodpecker-cache/vrifox.cc:/woodpecker/src/code.cozy.town/vrifox/website/resources/_gen
     when:
-      branch: main
+      - branch: main
+        event: [push, pull_request_closed, manual]
+
+  build-dev:
+    image: code.cozy.town/vrifox/hugoci:latest
+    commands:
+      - hugo --destination /woodpecker/build/ --baseURL "https://dev.vrifox.cc/" --cleanDestinationDir
+    volumes:
+      - /srv/woodpecker-cache/vrifox.cc:/woodpecker/src/code.cozy.town/vrifox.cc/website/resources/_gen
+    when:
+      - branch:
+          exclude: main
+        event: [push, pull_request, manual]
 
   upload-stable:
     image: code.cozy.town/vrifox/hugoci:latest
     commands:
       - mkdir -p /root/.ssh
-      - echo "$SSH_KEY" > /root/.ssh/id_ed25519
-      - chmod 700 /root/.ssh/id_ed25519
+      - echo "$${DEPLOY_BOT_SSH_KEY}" > /root/.ssh/id_ed25519
+      - chmod 400 /root/.ssh/id_ed25519
       - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config
-      - rsync -rv --delete -e "ssh -p $SSH_PORT -i /root/.ssh/id_ed25519" /woodpecker/build/ caddy@$SSH_HOST:/var/lib/caddy/woodpecker/vrifox.cc/ --mkpath --checksum
-    secrets:
-      - ssh_key
-      - ssh_port
-      - ssh_host
+      - rsync -rv --delete -e "ssh -p 42824 -i /root/.ssh/id_ed25519" /woodpecker/build/ deploy-bot@$cozytown-main.cozy.town:/srv/http/vrifox.cc/ --mkpath --checksum
+    environment:
+      DEPLOY_BOT_SSH_KEY:
+        from_secret: deploy_bot_ssh_key
     when:
-      branch: main
-
-  build-dev:
-    image: code.cozy.town/vrifox/hugoci:latest
-    commands:
-      - hugo --destination /woodpecker/build/ --baseURL "https://dev.vrifox.cc/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/" --cleanDestinationDir
-    when:
-      branch:
-        exclude: main
+      - branch: main
+        event: [push, pull_request_closed, manual]
 
   upload-dev:
     image: code.cozy.town/vrifox/hugoci:latest
     commands:
       - mkdir -p /root/.ssh
-      - echo "$SSH_KEY" > /root/.ssh/id_ed25519
-      - chmod 700 /root/.ssh/id_ed25519
+      - echo "$${DEPLOY_BOT_SSH_KEY}" > /root/.ssh/id_ed25519
+      - chmod 400 /root/.ssh/id_ed25519
       - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config
-      - rsync -rv --delete -e "ssh -p $SSH_PORT -i /root/.ssh/id_ed25519" /woodpecker/build/ caddy@$SSH_HOST:/var/lib/caddy/woodpecker/vrifox.cc-dev/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/ --mkpath --checksum
-      - echo "The preview is now available on https://dev.vrifox.cc/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/"
-    secrets:
-      - ssh_key
-      - ssh_port
-      - ssh_host
+      - rsync -rv --delete -e "ssh -p 42824 -i /root/.ssh/id_ed25519" /woodpecker/build/ deploy-bot@cozytown-main.cozy.town:/srv/http/vrifox.cc-dev/ --mkpath --checksum
+      - echo "The preview is now available on https://dev.vrifox.cc/"
+    environment:
+      DEPLOY_BOT_SSH_KEY:
+        from_secret: deploy_bot_ssh_key
     when:
-      branch:
-        exclude: main
+      - branch:
+          exclude: main
+        event: [push, pull_request, manual]