Skip to content

Commit

Permalink
build.sh REACT_APP_IN_SYLVA_LOGIN_HOST fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ozcan Aytac; Insylva project committed Aug 20, 2020
1 parent d60021e commit 2424a89
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions portal/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion portal/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions search/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion search/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2424a89

Please sign in to comment.