From bb8840b37d7a63dbee35f23ff280e6286b58fdde Mon Sep 17 00:00:00 2001 From: Lucas Hahmann Date: Tue, 19 May 2026 09:14:33 +0200 Subject: [PATCH 1/8] Add dependencys --- .gitea/workflows/deploy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 8839ad6..02e19e2 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -18,6 +18,11 @@ jobs: - name: Hugo Build run: hugo + + # --- ADD THIS STEP --- + - name: Install Deployment Tools + run: | + apk add --no-cache rsync openssh-client - name: SSH vorbereiten run: | From 996aa73166ec7358cc8c98e753767688ab08dd4f Mon Sep 17 00:00:00 2001 From: Lucas Hahmann Date: Tue, 19 May 2026 09:21:22 +0200 Subject: [PATCH 2/8] Add dependencys --- .gitea/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 02e19e2..43c8901 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,7 +4,6 @@ on: push: branches: - main -# Test jobs: deploy: runs-on: ubuntu-24.04 From 8dbb528546f802d495e21914497a71e5cd549f2a Mon Sep 17 00:00:00 2001 From: Lucas Hahmann Date: Tue, 19 May 2026 09:23:18 +0200 Subject: [PATCH 3/8] Add dependencys --- .gitea/workflows/deploy.yml | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 43c8901..f344f5a 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,36 +4,46 @@ on: push: branches: - main + jobs: deploy: runs-on: ubuntu-24.04 - - container: - image: klakegg/hugo:ext-alpine - + # We don't use 'container:' at the top level to avoid entrypoint issues + steps: - name: Checkout uses: actions/checkout@v4 + with: + submodules: true # Hugo sites often have theme submodules + fetch-depth: 0 # Hugo needs history for .Lastmod + + - name: Setup Hugo + uses: peaceiris/actions-hugo@v3 + with: + hugo-version: 'latest' + extended: true - name: Hugo Build - run: hugo - - # --- ADD THIS STEP --- - - name: Install Deployment Tools + run: hugo --minify + + - name: Install SSH and Rsync run: | - apk add --no-cache rsync openssh-client + sudo apt-get update + sudo apt-get install -y rsync openssh-client - name: SSH vorbereiten run: | mkdir -p ~/.ssh echo "${{ secrets.DEPLOY_SSH_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - - echo "${{ secrets.KNOWN_HOSTS }}" > ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts + # Scan the host key to avoid interactive prompts + ssh-keyscan -H webserver.hahmann-trier.local >> ~/.ssh/known_hosts + # If ssh-keyscan fails because of your local network, + # ensure secrets.KNOWN_HOSTS is correctly set instead. - name: Deploy via rsync run: | rsync -avz --delete \ + -e "ssh -o StrictHostKeyChecking=accept-new" \ public/ \ gitea-runner@webserver.hahmann-trier.local:/var/www/www-deepwatersurvival-de \ No newline at end of file From dd6a09cd84045380ca87223c9b49813d292cd8b5 Mon Sep 17 00:00:00 2001 From: Lucas Hahmann Date: Tue, 19 May 2026 09:59:04 +0200 Subject: [PATCH 4/8] Add dependencys --- .gitea/workflows/deploy.yml | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index f344f5a..1bde4a4 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -8,42 +8,32 @@ on: jobs: deploy: runs-on: ubuntu-24.04 - # We don't use 'container:' at the top level to avoid entrypoint issues + container: + image: klakegg/hugo:ext-alpine # Wir bleiben bei Alpine steps: - name: Checkout uses: actions/checkout@v4 - with: - submodules: true # Hugo sites often have theme submodules - fetch-depth: 0 # Hugo needs history for .Lastmod - - name: Setup Hugo - uses: peaceiris/actions-hugo@v3 - with: - hugo-version: 'latest' - extended: true + - name: Tools installieren + # In Alpine nutzt man 'apk' statt 'apt-get' + run: | + apk add --no-cache rsync openssh-client - name: Hugo Build run: hugo --minify - - name: Install SSH and Rsync - run: | - sudo apt-get update - sudo apt-get install -y rsync openssh-client - - name: SSH vorbereiten run: | mkdir -p ~/.ssh echo "${{ secrets.DEPLOY_SSH_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - # Scan the host key to avoid interactive prompts - ssh-keyscan -H webserver.hahmann-trier.local >> ~/.ssh/known_hosts - # If ssh-keyscan fails because of your local network, - # ensure secrets.KNOWN_HOSTS is correctly set instead. + # Bekannte Hosts hinzufügen + echo "${{ secrets.KNOWN_HOSTS }}" > ~/.ssh/known_hosts - name: Deploy via rsync run: | rsync -avz --delete \ - -e "ssh -o StrictHostKeyChecking=accept-new" \ + -e "ssh -o StrictHostKeyChecking=accept-new -i ~/.ssh/id_ed25519" \ public/ \ gitea-runner@webserver.hahmann-trier.local:/var/www/www-deepwatersurvival-de \ No newline at end of file From 589d85b1083b66685e16098c2da524ce2e7b4f5e Mon Sep 17 00:00:00 2001 From: Lucas Hahmann Date: Tue, 19 May 2026 10:01:29 +0200 Subject: [PATCH 5/8] Add dependencys --- .gitea/workflows/deploy.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 1bde4a4..6897446 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -11,6 +11,12 @@ jobs: container: image: klakegg/hugo:ext-alpine # Wir bleiben bei Alpine + env: + # Proxy-Einstellungen (WICHTIG!) + http_proxy: http://172.16.10.93:3128 + https_proxy: http://172.16.10.93:3128 + no_proxy: localhost,127.0.0.1,webserver.hahmann-trier.local + steps: - name: Checkout uses: actions/checkout@v4 From 0aeb73fc1ec82a4a7d4b6951896efcdb866f8fad Mon Sep 17 00:00:00 2001 From: Lucas Hahmann Date: Tue, 19 May 2026 10:06:40 +0200 Subject: [PATCH 6/8] Add dependencys --- .gitea/workflows/deploy.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 6897446..15b55c5 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -9,10 +9,9 @@ jobs: deploy: runs-on: ubuntu-24.04 container: - image: klakegg/hugo:ext-alpine # Wir bleiben bei Alpine + image: klakegg/hugo:ext-alpine env: - # Proxy-Einstellungen (WICHTIG!) http_proxy: http://172.16.10.93:3128 https_proxy: http://172.16.10.93:3128 no_proxy: localhost,127.0.0.1,webserver.hahmann-trier.local @@ -22,7 +21,6 @@ jobs: uses: actions/checkout@v4 - name: Tools installieren - # In Alpine nutzt man 'apk' statt 'apt-get' run: | apk add --no-cache rsync openssh-client @@ -31,15 +29,22 @@ jobs: - name: SSH vorbereiten run: | - mkdir -p ~/.ssh - echo "${{ secrets.DEPLOY_SSH_KEY }}" > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - # Bekannte Hosts hinzufügen - echo "${{ secrets.KNOWN_HOSTS }}" > ~/.ssh/known_hosts + # Verzeichnis sicher erstellen + mkdir -p /root/.ssh + chmod 700 /root/.ssh + + # Key schreiben und sicherstellen, dass er mit einer neuen Zeile endet + echo "${{ secrets.DEPLOY_SSH_KEY }}" > /root/.ssh/id_ed25519 + chmod 600 /root/.ssh/id_ed25519 + + # Known Hosts schreiben + echo "${{ secrets.KNOWN_HOSTS }}" > /root/.ssh/known_hosts + chmod 644 /root/.ssh/known_hosts - name: Deploy via rsync run: | + # Wir nutzen den absoluten Pfad zum Key /root/.ssh/id_ed25519 rsync -avz --delete \ - -e "ssh -o StrictHostKeyChecking=accept-new -i ~/.ssh/id_ed25519" \ + -e "ssh -i /root/.ssh/id_ed25519 -o StrictHostKeyChecking=accept-new" \ public/ \ gitea-runner@webserver.hahmann-trier.local:/var/www/www-deepwatersurvival-de \ No newline at end of file From 7523fc25e4106344b431b5f5e2ab6aaba2c91a74 Mon Sep 17 00:00:00 2001 From: Lucas Hahmann Date: Tue, 19 May 2026 10:11:05 +0200 Subject: [PATCH 7/8] Add dependencys --- .gitea/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 15b55c5..c509a36 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -47,4 +47,4 @@ jobs: rsync -avz --delete \ -e "ssh -i /root/.ssh/id_ed25519 -o StrictHostKeyChecking=accept-new" \ public/ \ - gitea-runner@webserver.hahmann-trier.local:/var/www/www-deepwatersurvival-de \ No newline at end of file + gitea-deploy@webserver.hahmann-trier.local:/var/www/www-deepwatersurvival-de \ No newline at end of file From 7caa09501d26ff0ab17c67cdec338600d8619616 Mon Sep 17 00:00:00 2001 From: Lucas Hahmann Date: Mon, 27 Jul 2026 09:43:25 +0000 Subject: [PATCH 8/8] =?UTF-8?q?=C3=84nderung=20des=20SSH=20Ports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index c509a36..9876f84 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -45,6 +45,6 @@ jobs: run: | # Wir nutzen den absoluten Pfad zum Key /root/.ssh/id_ed25519 rsync -avz --delete \ - -e "ssh -i /root/.ssh/id_ed25519 -o StrictHostKeyChecking=accept-new" \ + -e "ssh -p 8147 -i /root/.ssh/id_ed25519 -o StrictHostKeyChecking=accept-new" \ public/ \ gitea-deploy@webserver.hahmann-trier.local:/var/www/www-deepwatersurvival-de \ No newline at end of file