From ede3d555885cfbf935ced24b27341d374871b866 Mon Sep 17 00:00:00 2001
From: ktyl <me@ktyl.dev>
Date: Wed, 28 Sep 2022 00:33:46 +0100
Subject: [PATCH] deploy new site

---
 .drone.yml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5c047ce..2238815 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,7 +41,7 @@ steps:
     - apt-get update -qq > /dev/null
     - apt-get install ssh rsync -qq > /dev/null
 
-    #  configure ssh
+    # configure ssh
     - eval $(ssh-agent -s)
     - mkdir -p ~/.ssh
     - echo "$SSH_KEY" > ~/.ssh/id_rsa
@@ -49,19 +49,23 @@ steps:
     - ssh-add
     - echo "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
 
-    # copy old site
+    # prepare vars for host operations
     - host_dir="/var/www/$${HOST}"
     - backup_dir="~/backups/$${HOST}/$${HOST}-$${DRONE_STAGE_STARTED}"
-    - make_backup_dir="mkdir -p $backup_dir"
-    - copy_files="rsync -rP $host_dir/* $backup_dir"
     - host="$${USER}@$${HOST}"
 
+    # tasks
+    - make_backup_dir="mkdir -p $backup_dir"
+    - copy_backup_files="rsync -rP $host_dir $backup_dir"
+    - delete_current_files="sudo -n rm -r $host_dir"
+    - deploy_new_files="sudo -n mv $${HOST} $host_dir"
+
+    # archive old site
     - ssh $host $make_backup_dir
-    - ssh $host $copy_files
-    - rsync -rP site "$host:$${HOST}-new"
-
-      #- ssh 
-      #- ssh "$${USER}@$${HOST}" "[[ ! -d ~/gemini/content ]] || rm -r ~/gemini/content"
-      #- rsync -rP content "$${USER}@$${HOST}:gemini"
+    - ssh $host $copy_backup_files
 
+    # deploy new site
+    - rsync -rP site/* "$host:$${HOST}"
+    - ssh $host $delete_current_files
+    - ssh $host $deploy_new_files