ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make socket url dynamic

Browse Source
This commit is contained in:
ntr 2019-09-03 10:57:57 +10:00
parent 2728be796e
commit fbb7e58f3c
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/socket.jsx
View File

@ -1,11 +1,8 @@
const toast = require('izitoast'); const toast = require('izitoast');
const cbor = require('borc'); const cbor = require('borc');
const socketUrl = () => { const SOCKET_URL =
if (process.env.NODE_ENV === 'production') return 'wss://mnml.gg/api/ws'; `${window.location.protocol === 'https:' ? 'wss://' : 'ws://'}${window.location.host}/api/ws`;
if (process.env.NODE_ENV === 'staging') return 'wss://sixtysix.pro/api/ws';
return 'ws://localhost/api/ws';
};
function errorToast(err) { function errorToast(err) {
console.error(err); console.error(err);
@ -299,7 +296,7 @@ function createSocket(events) {
ws = null; ws = null;
} }
ws = new WebSocket(socketUrl()); ws = new WebSocket(SOCKET_URL);
ws.binaryType = 'arraybuffer'; ws.binaryType = 'arraybuffer';
// Listen for messages // Listen for messages

7
etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
View File

@ -12,8 +12,9 @@ map $http_upgrade $connection_upgrade {
'' close; '' close;
} }
# DEV
server { server {
server_name sixtysix.pro;
location / { location / {
root /var/lib/mnml/public/current; root /var/lib/mnml/public/current;
index index.html; index index.html;
@ -40,8 +41,8 @@ server {
listen [::]:443 ssl ipv6only=on; # managed by Certbot listen [::]:443 ssl ipv6only=on; # managed by Certbot
listen 443 ssl; # managed by Certbot listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/mnml.gg/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/sixtysix.pro/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/mnml.gg/privkey.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/sixtysix.pro/privkey.pem; # managed by Certbot
include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
} }