**

anatolicvs · Aug 20, 2020 · 10950aa · 10950aa
1 parent d4dc912
commit 10950aa
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 32 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -379,7 +379,7 @@ services:
       IN_SYLVA_GRANT_TYPE: "password"
       IN_SYLVA_REALM: "in-sylva"
     ports:
-      - 8081:8080
+      - 8081:8081
     links:
       - gatekeeper
       - keycloak

diff --git a/login/Dockerfile b/login/Dockerfile
@@ -74,4 +74,6 @@ EXPOSE 8080
 
 WORKDIR /app/in-sylva.user.login/
 
-CMD [ "pm2-runtime", "npm","--", "start" ]
+CMD [ "pm2-runtime", "npm","--", "start" ]
+
+# CMD  npm run start
diff --git a/portal/.env b/portal/.env
@@ -1,6 +1,7 @@
 REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/gatekeeper 
 REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/source-manager
 REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/keycloak
+REACT_APP_IN_SYLVA_LOGIN_HOST=http://localhost:8081
 REACT_APP_IN_SYLVA_CLIENT_ID=in-sylva.user.app
 REACT_APP_IN_SYLVA_GRANT_TYPE=password
 REACT_APP_IN_SYLVA_REALM=in-sylva

diff --git a/portal/.env_generic b/portal/.env_generic
@@ -1,6 +1,7 @@
 REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/gatekeeper 
 REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/source-manager
 REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/keycloak
+REACT_APP_IN_SYLVA_LOGIN_HOST=http://localhost:8081
 REACT_APP_IN_SYLVA_CLIENT_ID=in-sylva.user.app
 REACT_APP_IN_SYLVA_GRANT_TYPE=password
 REACT_APP_IN_SYLVA_REALM=in-sylva

diff --git a/search/nginx/nginx.conf b/search/nginx/nginx.conf
@@ -61,23 +61,23 @@ server {
     proxy_pass http://backend_search/;
   }
 
-  location /login/_next/static/ {
-    autoindex on;
+  # location /login/_next/static/ {
+  #  autoindex on;
     # /app/in-sylva.user.login/.next/static/G-XKPGgjYNxek_SDdSj9a/pages
-    alias /app/in-sylva.user.login/.next/static;
-  }
+  #  alias /app/in-sylva.user.login/.next/static;
+  #}
 
-  location /login/ {
-    proxy_pass http://login:8080/;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection 'upgrade';
-    proxy_set_header Host $host;
-    proxy_cache_bypass $http_upgrade;
-
-    sub_filter_once off;
-    proxy_set_header Accept-Encoding "";
-  }
+  # location /login/ {
+  #  proxy_pass http://login:8080/;
+  #  proxy_http_version 1.1;
+  #  proxy_set_header Upgrade $http_upgrade;
+  #  proxy_set_header Connection 'upgrade';
+  #  proxy_set_header Host $host;
+  #  proxy_cache_bypass $http_upgrade;
+
+  #  sub_filter_once off;
+  #  proxy_set_header Accept-Encoding "";
+  #}
 
 
   location /source-manager/ {

diff --git a/search/nginx/nginx_generic.conf b/search/nginx/nginx_generic.conf
@@ -61,23 +61,23 @@ server {
     proxy_pass http://backend_search/;
   }
 
-  location /login/_next/static/ {
-    autoindex on;
+  # location /login/_next/static/ {
+  #  autoindex on;
     # /app/in-sylva.user.login/.next/static/G-XKPGgjYNxek_SDdSj9a/pages
-    alias /app/in-sylva.user.login/.next/static;
-  }
+  #  alias /app/in-sylva.user.login/.next/static;
+  #}
 
-  location /login/ {
-    proxy_pass http://login:8080/;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection 'upgrade';
-    proxy_set_header Host $host;
-    proxy_cache_bypass $http_upgrade;
-
-    sub_filter_once off;
-    proxy_set_header Accept-Encoding "";
-  }
+  # location /login/ {
+  #  proxy_pass http://login:8080/;
+  #  proxy_http_version 1.1;
+  #  proxy_set_header Upgrade $http_upgrade;
+  #  proxy_set_header Connection 'upgrade';
+  #  proxy_set_header Host $host;
+  #  proxy_cache_bypass $http_upgrade;
+
+  #  sub_filter_once off;
+  #  proxy_set_header Accept-Encoding "";
+  #}
 
 
   location /source-manager/ {