summaryrefslogtreecommitdiff
path: root/nginx
diff options
context:
space:
mode:
Diffstat (limited to 'nginx')
-rw-r--r--nginx/nginx.conf5
-rw-r--r--nginx/sites/notif.vainsocial.dev.conf14
-rw-r--r--nginx/sites/vainsocial.dev.conf17
3 files changed, 35 insertions, 1 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;
+ }
}
diff --git a/nginx/sites/notif.vainsocial.dev.conf b/nginx/sites/notif.vainsocial.dev.conf
new file mode 100644
index 0000000..2ba3b01
--- /dev/null
+++ b/nginx/sites/notif.vainsocial.dev.conf
@@ -0,0 +1,14 @@
+server {
+
+ listen 80;
+ listen [::]:80;
+
+ server_name notif.vainsocial.dev;
+
+ location / {
+ proxy_pass http://websocket;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection $connection_upgrade;
+ }
+}
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 / {