Merge branch 'develop'

.mage.yml.dist

@@ -8,16 +8,11 @@ magephp:
             rsync: '-avz --delete'
             exclude:
                 - "/.git"
-                - "*.swp"
-                - "*.swo"
                 - "/.env.local"
-                - "/data"
-                - "/migrations/*"
+                - "/migrations/"
                 - "/public/uploads/"
                 - "/public/files/"
-                - "/var/cache/*"
-                - "/var/log/*"
-                - "/var/data.db"
+                - "/var/"
                 - "/public/js/fos_js_routes.json"
                 - "/public/build"
                 - "/public/media"

.woodpecker/deploy.yml

@@ -15,11 +15,10 @@ steps:
     commands:
       - cd "/builds/$CI_COMMIT_SHA"
       - mkdir "$HOME/.ssh"
-      - echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519"
+      - echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_rsa"
       - chmod 700 "$HOME/.ssh"
-      - chmod 600 "$HOME/.ssh/id_ed25519"
+      - chmod 600 "$HOME/.ssh/id_rsa"
       - cp .mage.yml.dist .mage.yml
       - sed -i "s/ssh_user/$SSH_USER/g" .mage.yml
       - sed -i "s/ssh_host/$SSH_HOST/g" .mage.yml
-      - sed -i "s#app_directory#$APP_DIRECTORY#g" .mage.yml
       - mage deploy "$CI_PIPELINE_DEPLOY_TARGET"