diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2017-04-10 12:05:26 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2017-04-10 12:05:26 +0200 |
| commit | b8a2d4681147deb38092baaff36fc6bf7ce8ef8f (patch) | |
| tree | 8ed4afb143023f000351891a58c79ad9a54b5a79 /nginx/sites/vainsocial.dev.conf | |
| parent | 0f02d299f8e72c357067bf57031cf5b3427fe2ec (diff) | |
| parent | 2b732205079c1321f7bcdde9c730aee88a8e909c (diff) | |
| download | vaindock-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/sites/vainsocial.dev.conf')
| -rw-r--r-- | nginx/sites/vainsocial.dev.conf | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/nginx/sites/vainsocial.dev.conf b/nginx/sites/vainsocial.dev.conf index f32b01c..7760861 100644 --- a/nginx/sites/vainsocial.dev.conf +++ b/nginx/sites/vainsocial.dev.conf @@ -8,7 +8,22 @@ server { index index.php index.html index.htm; location /bridge { - proxy_pass http://192.168.1.34:8880/api; + # proxy_pass http://192.168.1.34:8880/api; + proxy_pass http://bridge/api; + } + + location /ws { + proxy_pass http://websocket; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + } + + location /stomp { + proxy_pass http://websocket; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; } location / { |