From 061f6fef5c5c0251c4c8f28b97e4461c33c7c61d Mon Sep 17 00:00:00 2001
From: Ludger Sicking <sicking@comenius.de>
Date: Tue, 3 Dec 2024 10:44:10 +0100
Subject: [PATCH] Deployment: Logik bei Pull Requests erproben 010

---
 .woodpecker/build_and_copy_blog.yaml | 8 +++++---
 archiv/eine-deployment-datei         | 5 -----
 sb/scripts/kein-helferlein.sh        | 5 -----
 3 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 archiv/eine-deployment-datei
 delete mode 100644 sb/scripts/kein-helferlein.sh

diff --git a/.woodpecker/build_and_copy_blog.yaml b/.woodpecker/build_and_copy_blog.yaml
index 67763cd..a535020 100644
--- a/.woodpecker/build_and_copy_blog.yaml
+++ b/.woodpecker/build_and_copy_blog.yaml
@@ -28,6 +28,8 @@ steps:
         from_secret: ssh_key
       SSH_PORT:
         from_secret: ssh_port
+      DOMAIN_FOLDER:
+        from_secret: domain_folder
       TARGET_PATH:
         from_secret: target_path
 
@@ -38,6 +40,6 @@ steps:
       - chmod 600 ~/.ssh/deployKey
       - ssh-keyscan -H -p $SSH_PORT $SSH_HOST 2>/dev/null >> ~/.ssh/known_hosts
       - chmod 600 ~/.ssh/known_hosts
-      - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST 'touch $HOME/time_begin_copy_$(date +"%Y-%m-%d_%T_%N")'
-      - scp -r -i ~/.ssh/deployKey -P $SSH_PORT sb/public/* $SSH_USER@$SSH_HOST:$TARGET_PATH/
-      - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST 'touch $HOME/time_end_copy_$(date +"%Y-%m-%d_%T_%N")'
\ No newline at end of file
+      - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST 'touch $DOMAIN_FOLDER/log/time_begin_copy_$(date +"%Y-%m-%d_%T_%N")'
+      - scp -r -i ~/.ssh/deployKey -P $SSH_PORT sb/public/* $SSH_USER@$SSH_HOST:$DOMAIN_FOLDER/$TARGET_PATH/
+      - ssh -i ~/.ssh/deployKey -p $SSH_PORT $SSH_USER@$SSH_HOST 'touch $DOMAIN_FOLDER/log/time_end_copy_$(date +"%Y-%m-%d_%T_%N")'
\ No newline at end of file
diff --git a/archiv/eine-deployment-datei b/archiv/eine-deployment-datei
deleted file mode 100644
index 94c3c54..0000000
--- a/archiv/eine-deployment-datei
+++ /dev/null
@@ -1,5 +0,0 @@
-In dieser Datei wird sich -
-abhängig vom Deployment Schritt -
-mal mehr, mal weniger ändern.
-
-Vielleicht läuft der Build Step nun.
\ No newline at end of file
diff --git a/sb/scripts/kein-helferlein.sh b/sb/scripts/kein-helferlein.sh
deleted file mode 100644
index e4cd2a1..0000000
--- a/sb/scripts/kein-helferlein.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# ist die Shell eine bash?
-# ich vermute ja, aber vielleicht auch zsh oder gar ksh?
-echo $S HELL
\ No newline at end of file