From 2fd2e6ea03784571f95ea42767e9802903dabb8d Mon Sep 17 00:00:00 2001 From: Lars Gebhardt-Kusche Date: Fri, 14 Nov 2025 01:55:34 +0100 Subject: [PATCH 1/7] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 391a78f..3e87a87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,6 @@ deploy:staging: url: https://staging.usbcheck.it only: - - main - develop - merge_requests From 5049da91ce505262719cc04564c055ea7e569f60 Mon Sep 17 00:00:00 2001 From: Lars Gebhardt-Kusche Date: Fri, 14 Nov 2025 02:03:10 +0100 Subject: [PATCH 2/7] Add new directory --- config/prod/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 config/prod/.gitkeep diff --git a/config/prod/.gitkeep b/config/prod/.gitkeep new file mode 100644 index 0000000..e69de29 From 3c57032f5a93d06a4ff46917ddc0b8720d23fcd4 Mon Sep 17 00:00:00 2001 From: Lars Gebhardt-Kusche Date: Fri, 14 Nov 2025 02:03:28 +0100 Subject: [PATCH 3/7] Add new directory --- config/staging/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 config/staging/.gitkeep diff --git a/config/staging/.gitkeep b/config/staging/.gitkeep new file mode 100644 index 0000000..e69de29 From aaf4786cb6ec940b9fc3cb7d3be36c3e6d989315 Mon Sep 17 00:00:00 2001 From: Lars Gebhardt-Kusche Date: Fri, 14 Nov 2025 02:20:28 +0100 Subject: [PATCH 4/7] Add new file --- config/prod/configprod.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/prod/configprod.txt diff --git a/config/prod/configprod.txt b/config/prod/configprod.txt new file mode 100644 index 0000000..30d74d2 --- /dev/null +++ b/config/prod/configprod.txt @@ -0,0 +1 @@ +test \ No newline at end of file From ec1eb4fc4bad1397faf8ffe18ddf360ee6b40b14 Mon Sep 17 00:00:00 2001 From: Lars Gebhardt-Kusche Date: Fri, 14 Nov 2025 02:21:03 +0100 Subject: [PATCH 5/7] Add new file --- config/staging/configstaging.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/staging/configstaging.txt diff --git a/config/staging/configstaging.txt b/config/staging/configstaging.txt new file mode 100644 index 0000000..9f854e5 --- /dev/null +++ b/config/staging/configstaging.txt @@ -0,0 +1 @@ +staging \ No newline at end of file From dbb2e70a252268ae6ac3de58a597b6c2dfc25d4a Mon Sep 17 00:00:00 2001 From: Lars Gebhardt-Kusche Date: Fri, 14 Nov 2025 02:25:57 +0100 Subject: [PATCH 6/7] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 100 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 82 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e87a87..3d8c334 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - deploy # ----------------------------------------- -# Deployment STAGING +# Deployment auf STAGING # ----------------------------------------- deploy:staging: stage: deploy @@ -22,11 +22,15 @@ deploy:staging: - ls -la public/ || echo "⚠️ public/ existiert nicht!" - echo "📂 Inhalt von config/:" - ls -la config/ || echo "⚠️ config/ existiert nicht!" + - echo "📂 Inhalt von config/staging/:" + - ls -la config/staging/ || echo "⚠️ config/staging/ existiert nicht!" script: - | - # Sicherstellen, dass alle drei Verzeichnisse existieren - for d in src public config; do + set -e + + # Sicherstellen, dass Basisverzeichnisse existieren + for d in src public config config/staging; do if [ ! -d "$d" ]; then echo "❌ Verzeichnis '$d/' fehlt im Repo! Abbruch." exit 1 @@ -35,14 +39,42 @@ deploy:staging: echo "🚀 Deploy STAGING → ${FTP_HOST}:${FTP_PATH_STAGING}" - # src deployen - lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e "set ftp:ssl-force true; set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; mirror -R --delete src/ ${FTP_PATH_STAGING}src/; bye" + echo "🔁 Sync src/ → ${FTP_PATH_STAGING}src/" + lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " + set ftp:ssl-force true; + set ftp:passive-mode true; + set ftp:ssl-protect-data true; + set ssl:verify-certificate no; + mirror -R --delete \ + --exclude .gitkeep \ + src/ ${FTP_PATH_STAGING}src/; + bye + " - # public deployen - lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e "set ftp:ssl-force true; set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; mirror -R --delete public/ ${FTP_PATH_STAGING}public/; bye" + echo "🔁 Sync public/ → ${FTP_PATH_STAGING}public/" + lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " + set ftp:ssl-force true; + set ftp:passive-mode true; + set ftp:ssl-protect-data true; + set ssl:verify-certificate no; + mirror -R --delete \ + --exclude .gitkeep \ + public/ ${FTP_PATH_STAGING}public/; + bye + " - # config deployen - lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e "set ftp:ssl-force true; set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; mirror -R --delete config/ ${FTP_PATH_STAGING}config/; bye" + echo "🔁 Sync config/staging/ (nur Inhalt) → ${FTP_PATH_STAGING}config/" + lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " + set ftp:ssl-force true; + set ftp:passive-mode true; + set ftp:ssl-protect-data true; + set ssl:verify-certificate no; + lcd config/staging; + mirror -R --delete \ + --exclude .gitkeep \ + ./ ${FTP_PATH_STAGING}config/; + bye + " echo "✅ Deploy STAGING abgeschlossen." @@ -56,7 +88,7 @@ deploy:staging: # ----------------------------------------- -# Deployment PRODUCTION +# Deployment auf PRODUCTION # ----------------------------------------- deploy:production: stage: deploy @@ -76,11 +108,15 @@ deploy:production: - ls -la public/ || echo "⚠️ public/ existiert nicht!" - echo "📂 Inhalt von config/:" - ls -la config/ || echo "⚠️ config/ existiert nicht!" + - echo "📂 Inhalt von config/prod/:" + - ls -la config/prod/ || echo "⚠️ config/prod/ existiert nicht!" script: - | - # Sicherstellen, dass alle drei Verzeichnisse existieren - for d in src public config; do + set -e + + # Sicherstellen, dass Basisverzeichnisse existieren + for d in src public config config/prod; do if [ ! -d "$d" ]; then echo "❌ Verzeichnis '$d/' fehlt im Repo! Abbruch." exit 1 @@ -89,14 +125,42 @@ deploy:production: echo "🚀 Deploy PRODUCTION → ${FTP_HOST}:${FTP_PATH_PROD}" - # src deployen - lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e "set ftp:ssl-force true; set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; mirror -R --delete src/ ${FTP_PATH_PROD}src/; bye" + echo "🔁 Sync src/ → ${FTP_PATH_PROD}src/" + lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " + set ftp:ssl-force true; + set ftp:passive-mode true; + set ftp:ssl-protect-data true; + set ssl:verify-certificate no; + mirror -R --delete \ + --exclude .gitkeep \ + src/ ${FTP_PATH_PROD}src/; + bye + " - # public deployen - lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e "set ftp:ssl-force true; set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; mirror -R --delete public/ ${FTP_PATH_PROD}public/; bye" + echo "🔁 Sync public/ → ${FTP_PATH_PROD}public/" + lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " + set ftp:ssl-force true; + set ftp:passive-mode true; + set ftp:ssl-protect-data true; + set ssl:verify-certificate no; + mirror -R --delete \ + --exclude .gitkeep \ + public/ ${FTP_PATH_PROD}public/; + bye + " - # config deployen - lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e "set ftp:ssl-force true; set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; mirror -R --delete config/ ${FTP_PATH_PROD}config/; bye" + echo "🔁 Sync config/prod/ (nur Inhalt) → ${FTP_PATH_PROD}config/" + lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e " + set ftp:ssl-force true; + set ftp:passive-mode true; + set ftp:ssl-protect-data true; + set ssl:verify-certificate no; + lcd config/prod; + mirror -R --delete \ + --exclude .gitkeep \ + ./ ${FTP_PATH_PROD}config/; + bye + " echo "✅ Deploy PRODUCTION abgeschlossen." From 82e10c9b999a7119cb4ee456347a0fb5deabdeee Mon Sep 17 00:00:00 2001 From: Lars Gebhardt-Kusche Date: Fri, 14 Nov 2025 02:49:09 +0100 Subject: [PATCH 7/7] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d8c334..34938f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,9 +45,7 @@ deploy:staging: set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; - mirror -R --delete \ - --exclude .gitkeep \ - src/ ${FTP_PATH_STAGING}src/; + mirror -R --delete --exclude .gitkeep src/ ${FTP_PATH_STAGING}src/; bye " @@ -57,9 +55,7 @@ deploy:staging: set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; - mirror -R --delete \ - --exclude .gitkeep \ - public/ ${FTP_PATH_STAGING}public/; + mirror -R --delete --exclude .gitkeep public/ ${FTP_PATH_STAGING}public/; bye " @@ -70,9 +66,7 @@ deploy:staging: set ftp:ssl-protect-data true; set ssl:verify-certificate no; lcd config/staging; - mirror -R --delete \ - --exclude .gitkeep \ - ./ ${FTP_PATH_STAGING}config/; + mirror -R --delete --exclude .gitkeep ./ ${FTP_PATH_STAGING}config/; bye " @@ -131,9 +125,7 @@ deploy:production: set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; - mirror -R --delete \ - --exclude .gitkeep \ - src/ ${FTP_PATH_PROD}src/; + mirror -R --delete --exclude .gitkeep src/ ${FTP_PATH_PROD}src/; bye " @@ -143,9 +135,7 @@ deploy:production: set ftp:passive-mode true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; - mirror -R --delete \ - --exclude .gitkeep \ - public/ ${FTP_PATH_PROD}public/; + mirror -R --delete --exclude .gitkeep public/ ${FTP_PATH_PROD}public/; bye " @@ -156,9 +146,7 @@ deploy:production: set ftp:ssl-protect-data true; set ssl:verify-certificate no; lcd config/prod; - mirror -R --delete \ - --exclude .gitkeep \ - ./ ${FTP_PATH_PROD}config/; + mirror -R --delete --exclude .gitkeep ./ ${FTP_PATH_PROD}config/; bye "