Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix/setup_guide' of https://github.com/sumitsum/appsmith into fix/setup_guide

Browse Source
This commit is contained in:
Sumit Kumar 2020-10-30 00:59:02 +05:30
commit 6cf4c10c4b
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/client/docker/templates/nginx-linux.conf.template
View File

@ -45,19 +45,19 @@ server {
location /api { location /api {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://localhost:8080;
} }
location /oauth2 { location /oauth2 {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://localhost:8080;
} }
location /login { location /login {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://localhost:8080;
} }
} }
@ -112,19 +112,19 @@ server {
location /api { location /api {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://localhost:8080;
} }
location /oauth2 { location /oauth2 {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://localhost:8080;
} }
location /login { location /login {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://localhost:8080;
} }
} }

12
app/client/docker/templates/nginx-mac.conf.template
View File

@ -46,21 +46,21 @@ server {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://host.docker.internal:8080;
} }
location /oauth2 { location /oauth2 {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://host.docker.internal:8080;
} }
location /login { location /login {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://host.docker.internal:8080;
} }
} }
@ -114,20 +114,20 @@ server {
location /api { location /api {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://host.docker.internal:8080;
} }
location /oauth2 { location /oauth2 {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://host.docker.internal:8080;
} }
location /login { location /login {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_pass https://release-api.appsmith.com; proxy_pass http://host.docker.internal:8080;
} }
} }

4
contributions/ClientSetup.md
View File

@ -7,7 +7,7 @@ On your development machine, please ensure that:
1. You have `docker` installed in your system. If not, please visit: [https://docs.docker.com/get-docker/](https://docs.docker.com/get-docker/) 1. You have `docker` installed in your system. If not, please visit: [https://docs.docker.com/get-docker/](https://docs.docker.com/get-docker/)
2. You have `mkcert` installed. Please visit: [https://github.com/FiloSottile/mkcert#installation](https://github.com/FiloSottile/mkcert#installation) for details. For `mkcert` to work with Firefox you may require the `nss` utility to be installed. Details are in the link above. 2. You have `mkcert` installed. Please visit: [https://github.com/FiloSottile/mkcert#installation](https://github.com/FiloSottile/mkcert#installation) for details. For `mkcert` to work with Firefox you may require the `nss` utility to be installed. Details are in the link above.
3. You have `envsubst` installed. use `brew install gettext` on macOS. Linux machines usually have this installed. 3. You have `envsubst` installed. use `brew install gettext` on MacOS. Linux machines usually have this installed.
4. You have cloned the repo in your local machine. 4. You have cloned the repo in your local machine.
### Create local HTTPS certificates: ### Create local HTTPS certificates:
@ -72,7 +72,7 @@ node versions to be used in different projects. Check below for installation and
2. In the root of the project, run `nvm use 10.16.3` or `fnm use 10.16.3`. 2. In the root of the project, run `nvm use 10.16.3` or `fnm use 10.16.3`.
#### If you would like to hit a different Appsmith server: #### If you would like to hit a different Appsmith server:
- Change the API endpoint in the Nginx configuration files (`app/client/docker/templates/nginx-linux.conf.template` or `app/client/docker/templates/nginx-mac.conf.template`). By default it points to the cloud hosted server https://release-api.appsmith.com. If you want it to point to your local instance, then replace all such ip instances with `https://host.docker.internal:8080` for macOS or `http://localhost:8080` for Ubuntu. Please note that the communication with localhost uses http protocol instead of https. - Change the API endpoint in the Nginx configuration files (`app/client/docker/templates/nginx-mac.conf.template` on MacOS or `app/client/docker/templates/nginx-linux.conf.template` on Linux). By default it points to your local instance i.e. `http://host.docker.internal:8080` for MacOS or `http://localhost:8080` for Linux. You need to replace all the occurances of the default ip with your preferred ip.
- Run `start-https.sh` script again. - Run `start-https.sh` script again.
- Run - Run
``` ```