Merge remote-tracking branch 'origin/dev'

.woodpecker/.woodpecker.yml

@@ -28,16 +28,13 @@ steps:
     environment:
       DEPLOY_KEY:
         from_secret: deploy_key
-      SERVER_ENV_DEV:
-        from_secret: server_env_dev
     commands:
       - apk add --no-cache openssh rsync
       - mkdir -p /ssh
       - echo "$DEPLOY_KEY" > /ssh/deploy_key
       - chmod 600 /ssh/deploy_key
-      - echo "$SERVER_ENV_DEV" > /tmp/.env
       - rsync -e "ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no" -avz --delete --exclude node_modules --exclude .env --exclude .dev_env --exclude uploads --exclude '*.db' ./server/ root@192.168.1.118:/opt/shop/server/server/
-      - rsync -e "ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no" -avz /tmp/.env root@192.168.1.118:/opt/shop/server/server/.env
+      - rsync -e "ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no" -avz --delete --exclude .git --exclude node_modules ./shared/ root@192.168.1.118:/opt/shop/server/shared/
       - ssh -i /ssh/deploy_key -o StrictHostKeyChecking=no root@192.168.1.118 "cd /opt/shop/server/server && npm ci 2>&1 | tail -3 && npx prisma generate 2>&1 | tail -2 && npx prisma migrate deploy 2>&1 | tail -5 && systemctl restart shop-server"
     depends_on: [install]
     when:

test-server-dev.txt

@@ -0,0 +1 @@
+trigger-1781703952