From 7169c23bff4aed40f15aa8c3dd32967580aa2822 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 25 Apr 2022 12:58:59 +0200
Subject: [PATCH] gitlab-ci-cd/drupal#10 - improve steps for NG deployment

---
 test-and-deploy.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index 6c34b74..c51458a 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -422,14 +422,15 @@ Debug:
     - cd /data/app
     - drush -y sset system.maintenance_mode 1
     - cd -
-    - rm web/sites/default/files
-    - rm web/sites/default/private
+    - cd web/sites/default
+    - rm files
+    - rm private
+    - ln -s /data/default/public files
+    - ln -s /data/default/private private
+    - cd -
     - rsync -rlDzq --delete ./ /data/app
     - cd /data/files/public
     - if [[ ! -L config ]]; then ln -s /var/www/html/config/default config; fi
-    - cd /data/app/web/sites/default
-    - if [[ (readlink files) != '/data/default/public' ]]; then rm files; ln -s /data/default/public files; fi
-    - if [[ (readlink private) != '/data/default/private' ]]; then rm private; ln -s /data/default/private private; fi
     - cd /data/app
     - PROXYIP=$(docker inspect traefik_traefik_1 | jq -r '.[0].NetworkSettings.Networks."traefik-public".IPAddress')
     - sed -i "s/TRAEFIK-IP-PLACEHOLDER/${PROXYIP}/g" docker-compose.yml
-- 
GitLab