diff --git a/build.sh b/build.sh index 8328c87..820c7ff 100755 --- a/build.sh +++ b/build.sh @@ -72,12 +72,12 @@ if [ -z $MODE ]; then exit fi -if [ "$MODE" == "prod" ]; +if [ "$MODE" == "prod" ]; then echo -n "Would do like to reinitialize all docker volumes (this will delete previous data) ? [o/n] " read rep if [ "$rep" == "o" ]; then - docker-compose down - docker system prune -f + docker-compose down + docker system prune -f fi fi diff --git a/portal/.env b/portal/.env index e551209..8b50c49 100644 --- a/portal/.env +++ b/portal/.env @@ -1,7 +1,7 @@ -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_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/nginx/nginx.conf b/portal/nginx/nginx.conf index fc65f4e..bcdab21 100644 --- a/portal/nginx/nginx.conf +++ b/portal/nginx/nginx.conf @@ -34,7 +34,7 @@ server { listen 3000; listen [::]:3000; - server_name w3.avignon.inra.fr/bas_insylva/portal/; + server_name -; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/search/.env b/search/.env index c9022f2..6679f75 100644 --- a/search/.env +++ b/search/.env @@ -1,8 +1,8 @@ -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_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_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 6448a39..a8ed38d 100644 --- a/search/nginx/nginx.conf +++ b/search/nginx/nginx.conf @@ -32,7 +32,7 @@ server { listen 3001; listen [::]:3001; - server_name w3.avignon.inra.fr/bas_insylva/search/; + server_name -; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr;