Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
Betree committed Jul 19, 2018
2 parents 74d8326 + 3fbf4b2 commit 169ef2b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion config/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ http {

if ($prerender = 1) {
rewrite .* $request_uri? break;
proxy_pass https://OG_BASE_URL;
proxy_pass OG_BASE_URL;
}
if ($prerender = 0) {
rewrite .* /index.html break;
Expand Down
3 changes: 2 additions & 1 deletion rel/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ elif [ "$1" = "build" ]; then
FRONTEND_HOST=$(echo ${FRONTEND_URL} | sed -r "s/^https?:\/\///")
HTTP_API_BASE_URL=$(echo ${HTTP_API_URL} | sed -E 's,(https?://)([^/]+).*,\1\2,')
WS_API_BASE_URL=$(echo ${WS_API_URL} | sed -E 's,(wss?://)([^/]+).*,\1\2,')
OG_BASE_URL=$(echo ${OG_URL} | sed -r "s/^https?:\/\///")
OG_BASE_URL=${OG_URL}

cat ./config/nginx.conf \
| sed "s/FRONTEND_HOST/$FRONTEND_HOST/" \
| sed "s,HTTP_API_BASE_URL,$HTTP_API_BASE_URL,g" \
Expand Down

0 comments on commit 169ef2b

Please sign in to comment.