summaryrefslogtreecommitdiff
path: root/nginx/sites
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2017-04-04 12:02:41 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2017-04-04 12:02:41 +0200
commita63d865cf351c36f0fcd3236072a8e6e00061e32 (patch)
treea3d6d977bb701f7f0eddc985cc4213b6fd90a120 /nginx/sites
parentc2d78419d7d70370255e983ee73a059d18f51bb7 (diff)
parent3a229577db319776f986f96cd9c60baf645e7b3e (diff)
downloadvaindock-a63d865cf351c36f0fcd3236072a8e6e00061e32.tar.gz
vaindock-a63d865cf351c36f0fcd3236072a8e6e00061e32.zip
Merge branch 'release/2.0.0' of https://gitlab.com/vainglorygame/vaindock into release/2.0.0
Diffstat (limited to 'nginx/sites')
-rw-r--r--nginx/sites/vainsocial.dev.conf4
1 files changed, 4 insertions, 0 deletions
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;
}