Merge branch 'acs-frontend-enterprise' into ags-frontend-enterprise

docker-compose.yml

@@ -148,8 +148,8 @@ services:
             - 8080:8080
         depends_on:
             - platform
-            - share
             - sync
+            - share
             - digital-workspace
 
 volumes:

nginx-ingress/entrypoint.sh

@@ -4,14 +4,14 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $ACS_SHARE_URL ]]; then
-  sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
-fi
-
 if [[ $ACS_SYNC_URL ]]; then
   sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
 fi
 
+if [[ $ACS_SHARE_URL ]]; then
+  sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
+fi
+
 if [[ $ADW_URL ]]; then
   sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

@@ -49,6 +49,10 @@ http {
             absolute_redirect off;
         }
         
+        location /sync/ {
+            proxy_pass http://sync:9090/alfresco/;
+        }
+
         location /share/ {
             proxy_pass http://share:8080;
 
@@ -62,9 +66,5 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
-        
-        location /sync/ {
-            proxy_pass http://sync:9090/alfresco/;
-        }
     }
 }