summaryrefslogtreecommitdiff
path: root/nginx/nginx.conf
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2017-04-10 12:05:26 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2017-04-10 12:05:26 +0200
commitb8a2d4681147deb38092baaff36fc6bf7ce8ef8f (patch)
tree8ed4afb143023f000351891a58c79ad9a54b5a79 /nginx/nginx.conf
parent0f02d299f8e72c357067bf57031cf5b3427fe2ec (diff)
parent2b732205079c1321f7bcdde9c730aee88a8e909c (diff)
downloadvaindock-b8a2d4681147deb38092baaff36fc6bf7ce8ef8f.tar.gz
vaindock-b8a2d4681147deb38092baaff36fc6bf7ce8ef8f.zip
Merge branch 'release/2.0.0' of https://gitlab.com/vainglorygame/vaindock into release/2.0.0
Diffstat (limited to 'nginx/nginx.conf')
-rw-r--r--nginx/nginx.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index b6bafec..52a924c 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -34,6 +34,11 @@ http {
}
upstream websocket {
+ # server 192.168.1.37:15674;
server vaindock_queue:15674;
}
+
+ upstream bridge {
+ server vaindock_bridge:8880;
+ }
}