diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2017-04-04 12:02:41 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2017-04-04 12:02:41 +0200 |
| commit | a63d865cf351c36f0fcd3236072a8e6e00061e32 (patch) | |
| tree | a3d6d977bb701f7f0eddc985cc4213b6fd90a120 | |
| parent | c2d78419d7d70370255e983ee73a059d18f51bb7 (diff) | |
| parent | 3a229577db319776f986f96cd9c60baf645e7b3e (diff) | |
| download | vaindock-a63d865cf351c36f0fcd3236072a8e6e00061e32.tar.gz vaindock-a63d865cf351c36f0fcd3236072a8e6e00061e32.zip | |
Merge branch 'release/2.0.0' of https://gitlab.com/vainglorygame/vaindock into release/2.0.0
| -rw-r--r-- | nginx/nginx.conf | 2 | ||||
| -rw-r--r-- | nginx/sites/vainsocial.dev.conf | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nginx/nginx.conf b/nginx/nginx.conf index dd8fbc3..b6bafec 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -36,4 +36,4 @@ http { upstream websocket { server vaindock_queue:15674; } -}
\ No newline at end of file +} diff --git a/nginx/sites/vainsocial.dev.conf b/nginx/sites/vainsocial.dev.conf index 9e6155e..f32b01c 100644 --- a/nginx/sites/vainsocial.dev.conf +++ b/nginx/sites/vainsocial.dev.conf @@ -7,6 +7,10 @@ server { root /var/www/vainsocial/public; index index.php index.html index.htm; + location /bridge { + proxy_pass http://192.168.1.34:8880/api; + } + location / { try_files $uri $uri/ /index.php$is_args$args; } |