[Upd] Use /services to separate services from Record Manager UI

kbss-cvut · Nov 26, 2023 · 1e2631a · 1e2631a
1 parent a83d013
commit 1e2631a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/deploy/internal-auth/docker-compose.yml b/deploy/internal-auth/docker-compose.yml
@@ -33,7 +33,7 @@ services:
     depends_on:
       - record-manager-server
     environment:
-      API_URL: "${PUBLIC_ORIGIN:-http://localhost:${INTERNAL_HOST_PORT:-1235}}${RECORD_MANAGER_ROOT_PATH:-/record-manager}/record-manager-server"
+      API_URL: "${PUBLIC_ORIGIN:-http://localhost:${INTERNAL_HOST_PORT:-1235}}${RECORD_MANAGER_ROOT_PATH:-/record-manager}/services/record-manager-server"
       APP_INFO: "${RECORD_MANAGER_APP_INFO:-}"
       APP_TITLE: "${RECORD_MANAGER_APP_TITLE:-Record Manager}"
       LANGUAGE: "${LANGUAGE:-en}"
@@ -74,7 +74,7 @@ services:
       context: ../shared/db-server
     container_name: ${RECORD_SET_NAME:-rm}-db-server
     environment:
-      GDB_JAVA_OPTS: "-Dgraphdb.external-url=${PUBLIC_ORIGIN:-http://localhost:${INTERNAL_HOST_PORT:-1235}}${RECORD_MANAGER_ROOT_PATH:-/record-manager}/db-server"
+      GDB_JAVA_OPTS: "-Dgraphdb.external-url=${PUBLIC_ORIGIN:-http://localhost:${INTERNAL_HOST_PORT:-1235}}${RECORD_MANAGER_ROOT_PATH:-/record-manager}/services/db-server"
     expose:
       - "7200"  
     restart: always

diff --git a/deploy/internal-auth/nginx/nginx.conf b/deploy/internal-auth/nginx/nginx.conf
@@ -52,20 +52,20 @@ http {
             proxy_pass http://record-manager/; # keep the trailing slash to cut off matched prefix
         }
 
-        location /record-manager/record-manager-server/ {
+        location /record-manager/services/record-manager-server/ {
             proxy_pass http://record-manager-server:8080/record-manager/; # keep the trailing slash to cut off matched prefix
-            proxy_cookie_path /record-manager $record_manager_root_path;
+            proxy_cookie_path /record-manager $record_manager_root_path/services;
         }
 
-        location = /record-manager/db-server {
-            return 302 $record_manager_origin$record_manager_root_path/db-server/;
+        location = /record-manager/services/db-server {
+            return 302 $record_manager_origin$record_manager_root_path/services/db-server/;
         }
 
-        location /record-manager/db-server/ {
+        location /record-manager/services/db-server/ {
             proxy_pass http://db-server:7200/; # keep the trailing slash to cut off matched prefix
         }
 
-        location /record-manager/s-pipes/ {
+        location /record-manager/services/s-pipes/ {
             proxy_pass http://s-pipes-engine:8080/; # keep the trailing slash to cut off matched prefix
         }