Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

This commit is contained in:
Trisha Anand 2020-07-22 23:31:11 +05:30
commit b5ff5e00e1

View File

@ -9,7 +9,7 @@ fi
# Hence we wish to prevent environment substitution here. # Hence we wish to prevent environment substitution here.
# Relevant variables will be replaced at the end of this file via sed command # Relevant variables will be replaced at the end of this file via sed command
echo ' content='
server { server {
listen 80; listen 80;
$NGINX_SSL_CMNT server_name $custom_domain ; $NGINX_SSL_CMNT server_name $custom_domain ;
@ -115,12 +115,8 @@ $NGINX_SSL_CMNT proxy_pass http://appsmith-internal-server:8080;
$NGINX_SSL_CMNT } $NGINX_SSL_CMNT }
$NGINX_SSL_CMNT $NGINX_SSL_CMNT
$NGINX_SSL_CMNT } $NGINX_SSL_CMNT }
' >| nginx_app.conf '
if [[ "$OSTYPE" == "darwin"* ]]; then echo "$content" \
sed -i '' "s/\$NGINX_SSL_CMNT/$NGINX_SSL_CMNT/g" nginx_app.conf | sed -e "s/\$NGINX_SSL_CMNT/$NGINX_SSL_CMNT/g" -e "s/\$custom_domain/$custom_domain/g" \
sed -i '' "s/\$custom_domain/$custom_domain/g" nginx_app.conf >| nginx_app.conf
else
sed -i "s/\$NGINX_SSL_CMNT/$NGINX_SSL_CMNT/g" nginx_app.conf
sed -i "s/\$custom_domain/$custom_domain/g" nginx_app.conf
fi