From fbb7e58f3cffdc6720611d01df2011501f086958 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 3 Sep 2019 10:57:57 +1000
Subject: [PATCH] make socket url dynamic

---
 client/src/socket.jsx                                    | 9 +++------
 .../sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf    | 7 ++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/client/src/socket.jsx b/client/src/socket.jsx
index b8e919b9..e19c5c4b 100644
--- a/client/src/socket.jsx
+++ b/client/src/socket.jsx
@@ -1,11 +1,8 @@
 const toast = require('izitoast');
 const cbor = require('borc');
 
-const socketUrl = () => {
-    if (process.env.NODE_ENV === 'production') return 'wss://mnml.gg/api/ws';
-    if (process.env.NODE_ENV === 'staging') return 'wss://sixtysix.pro/api/ws';
-    return 'ws://localhost/api/ws';
-};
+const SOCKET_URL =
+    `${window.location.protocol === 'https:' ? 'wss://' : 'ws://'}${window.location.host}/api/ws`;
 
 function errorToast(err) {
     console.error(err);
@@ -299,7 +296,7 @@ function createSocket(events) {
             ws = null;
         }
 
-        ws = new WebSocket(socketUrl());
+        ws = new WebSocket(SOCKET_URL);
         ws.binaryType = 'arraybuffer';
 
         // Listen for messages
diff --git a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
index 5e3fab85..8383b79d 100644
--- a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
+++ b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
@@ -12,8 +12,9 @@ map $http_upgrade $connection_upgrade {
     '' close;
 }
 
-# DEV
 server {
+    server_name sixtysix.pro;
+
     location / {
         root /var/lib/mnml/public/current;
         index index.html;
@@ -40,8 +41,8 @@ server {
 
     listen [::]:443 ssl ipv6only=on; # managed by Certbot
     listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/mnml.gg/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/mnml.gg/privkey.pem; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/sixtysix.pro/fullchain.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
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 }