eam
/
eam-ui
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/eam/eam-ui

master
ljlong_2630 7 months ago
parent
5035645dcc ff1621f3ce
commit
388433d7f7
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      nginx.conf
  2. 2
      nginx_prod.conf

4
nginx.conf
View File

@ -32,7 +32,7 @@ http {
server { server {
listen 25200; listen 25200;
server_name_in_redirect off; server_name_in_redirect off;
server_name dev.ccwin-in.com; server_name _;
location /api/ { location /api/ {
proxy_pass http://eam/; proxy_pass http://eam/;
proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
@ -57,4 +57,4 @@ http {
index index.html index.htm; index index.html index.htm;
} }
} }
} }

2
nginx_prod.conf
View File

@ -32,7 +32,7 @@ http {
server { server {
listen 80; listen 80;
server_name_in_redirect off; server_name_in_redirect off;
server_name dev.ccwin-in.com; server_name _;
location /api/ { location /api/ {
proxy_pass http://eam/; proxy_pass http://eam/;
proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header; proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;

Write Preview
Loading…
Cancel
Save