diff --git a/build.sh b/build.sh index d94c1da..bc786d1 100755 --- a/build.sh +++ b/build.sh @@ -110,6 +110,7 @@ if [ "$MODE" == "prod" ];then # portal customization sed -i -e "s,server_name .,server_name ${DOMAIN}portal/," portal/nginx/nginx.conf sed -i -e "s,_HOST=/,_HOST=${NGINXCONF}/portal/," portal/.env + sed -i -e "s,REACT_APP_IN_SYLVA_LOGIN_HOST=.*,REACT_APP_IN_SYLVA_LOGIN_HOST=http://${DOMAIN}login/," portal/.env fi diff --git a/portal/.env b/portal/.env index 8b50c49..e551209 100644 --- a/portal/.env +++ b/portal/.env @@ -1,7 +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_GATEKEEPER_HOST=/bas_insylva/portal/gatekeeper +REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/bas_insylva/portal/source-manager +REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/bas_insylva/portal/keycloak +REACT_APP_IN_SYLVA_LOGIN_HOST=http://w3.avignon.inra.fr/bas_insylva/login/ 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/nginx/nginx.conf b/portal/nginx/nginx.conf index bcdab21..fc65f4e 100644 --- a/portal/nginx/nginx.conf +++ b/portal/nginx/nginx.conf @@ -34,7 +34,7 @@ server { listen 3000; listen [::]:3000; - server_name -; + server_name w3.avignon.inra.fr/bas_insylva/portal/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/search/.env b/search/.env index 6679f75..c9022f2 100644 --- a/search/.env +++ b/search/.env @@ -1,8 +1,8 @@ -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_SEARCH_HOST=/search-api -REACT_APP_IN_SYLVA_LOGIN_HOST=http://localhost:8081 +REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/bas_insylva/search/gatekeeper +REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/bas_insylva/search/source-manager +REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/bas_insylva/search/keycloak +REACT_APP_IN_SYLVA_SEARCH_HOST=/bas_insylva/search/search-api +REACT_APP_IN_SYLVA_LOGIN_HOST=http://w3.avignon.inra.fr/bas_insylva/login/ 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 index a8ed38d..6448a39 100644 --- a/search/nginx/nginx.conf +++ b/search/nginx/nginx.conf @@ -32,7 +32,7 @@ server { listen 3001; listen [::]:3001; - server_name -; + server_name w3.avignon.inra.fr/bas_insylva/search/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr;