[kbss-cvut/termit-ui#528] Modify configuration to allow integration o…

…f TermIt and OntoGrapher.
kbss-cvut · Oct 23, 2024 · 78c7d21 · 78c7d21
1 parent 79cdc14
commit 78c7d21
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -51,7 +51,7 @@ services:
       REPOSITORY_USERNAME: ${GDB_USERNAME}
       REPOSITORY_PASSWORD: ${GDB_PASSWORD}
       DB_SERVER_CONTEXT: http://onto.fel.cvut.cz/ontologies/application/termit/users
-      USER_TYPE: http://onto.fel.cvut.cz/ontologies/application/termit/pojem/uživatel-termitu
+      VOCABULARY_USER_TYPE: http://onto.fel.cvut.cz/ontologies/application/termit/pojem/uživatel-termitu
       ADD_ACCOUNTS: false
       REALM_ID: termit
     restart: always
@@ -93,6 +93,8 @@ services:
       TERMIT_TEXTANALYSIS_URL: http://annotace-server:8080/annotate?enableKeywordExtraction=true
       TERMIT_LANGUAGE_TYPES_SOURCE: /tmp/z-sgov-glosář.ttl
       TERMIT_SECURITY_PROVIDER: oidc
+      TERMIT_URL: ${URL}${ROOT}
+      TERMIT_MODELINGTOOLURL: ${URL}${ROOT}/ontographer
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUERURI: ${URL}${ROOT}/sluzby/auth/realms/termit
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWKSETURI: http://auth-server:8080/realms/termit/protocol/openid-connect/certs
     volumes:
@@ -104,6 +106,7 @@ services:
       - termit-db-server
     environment:
       SERVER_PORT: 8080
+      PROXY_URL: ${URL}${ROOT}/sluzby/db-proxy
       PROXY_GRAPHDB_URL: http://termit-db-server:7200
       PROXY_GRAPHDB_USERNAME: ${GDB_USERNAME}
       PROXY_GRAPHDB_PASSWORD: ${GDB_PASSWORD}

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -22,25 +22,25 @@ http {
         add_header Access-Control-Allow-Origin *;
 
         location ${ROOT}/sluzby/auth {
-                    return 302 ${ORIGIN}/${ROOT}/sluzby/auth/;
-                }
-
-                location ${ROOT}/sluzby/auth/ {
-                    proxy_pass http://auth-server:8080/;
-                    proxy_set_header Host $host;
-                    proxy_set_header X-Forwarded-Host $server_name;
-                    proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
-                    proxy_set_header X-Real-IP $remote_addr;
-                    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                    proxy_set_header Cookie $http_cookie;
-                    proxy_set_header X-Forwarded-Proto $scheme;
-                    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-                    # Increase buffer sizes to handle large headers sent by Keycloak and its clients
-                    proxy_buffer_size   128k;
-                    proxy_buffers       4 256k;
-                    proxy_busy_buffers_size 256k;
-                }
+            return 302 ${ORIGIN}/${ROOT}/sluzby/auth/;
+        }
+
+        location ${ROOT}/sluzby/auth/ {
+            proxy_pass http://auth-server:8080/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Host $server_name;
+            proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Cookie $http_cookie;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+            # Increase buffer sizes to handle large headers sent by Keycloak and its clients
+            proxy_buffer_size   128k;
+            proxy_buffers       4 256k;
+            proxy_busy_buffers_size 256k;
+        }
 
         location = ${ROOT}/sluzby/db-server {
             return 302 ${ORIGIN}${ROOT}/sluzby/db-server/;
@@ -51,7 +51,7 @@ http {
         }
 
         location = ${ROOT}/ontographer {
-          return 302 ${ORIGIN}${ROOT}/ontographer/;
+          return 302 ${ORIGIN}${ROOT}/ontographer/$is_args$args;
         }
 
         location ${ROOT}/ontographer/ {
@@ -61,8 +61,8 @@ http {
         }
 
         location = ${ROOT}/sluzby/server {
-                  return 302 ${ORIGIN}${ROOT}/sluzby/termit/;
-                }
+            return 302 ${ORIGIN}${ROOT}/sluzby/termit/;
+        }
 
         location ${ROOT}/sluzby/server/ {
             proxy_http_version 1.1;
@@ -81,6 +81,8 @@ http {
         location ${ROOT}/sluzby/db-proxy/ {
             proxy_pass http://db-server-proxy:8080/gdb-proxy/;
             proxy_set_header X-Forwarded-Host $host;
+            proxy_set_header X-Forwarded-Prefix ${ROOT}/sluzby/db-proxy/;
+            proxy_set_header X-Forwarded-Port ${PORT};
 
             proxy_http_version 1.1;
             proxy_set_header   "Connection" "";