account wip

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

@@ -2,6 +2,17 @@ upstream mnml_dev {
     server 0.0.0.0:41337;
 }
 
+error_log /var/log/mnml/nginx.log;
+
+upstream mnml_http {
+    server 127.0.0.1:40000;
+}
+
+upstream mnml_ws {
+    server 127.0.0.1:40055;
+}
+
+
 map $http_upgrade $connection_upgrade {
     default upgrade;
     '' close;
@@ -9,25 +20,19 @@ map $http_upgrade $connection_upgrade {
 
 # DEV
 server {
-    root /var/lib/mnml/public/;
-    index index.html;
-
-    server_name dev.mnml.gg; # managed by Certbot
-
     location / {
+        root /var/lib/mnml/public/current;
+        index index.html;
+        try_files $uri $uri/ index.html;
+    }
+
+    location /imgs/ {
+        root /var/lib/mnml/public/;
         try_files $uri $uri/ =404;
     }
 
-    listen [::]:443;
-    ssl on;
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/dev.mnml.gg/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/dev.mnml.gg/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
-
     location /api/ws {
-        proxy_pass http://mnml_dev;
+        proxy_pass http://mnml_ws;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $connection_upgrade;
@@ -35,13 +40,34 @@ server {
     }
 
     location /api/ {
-        proxy_pass http://mnml_dev;
+        proxy_pass http://mnml_http;
         proxy_read_timeout 600s;
     }
 
+    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
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 }
 
 # http -> https
+server {
+    server_name mnml.gg;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    server_name minimal.gg;
+    return 301 https://mnml.gg$request_uri;
+}
+
+server {
+    server_name cryps.gg;
+    return 301 https://mnml.gg$request_uri;
+}
+
 server {
     server_name dev.mnml.gg;
     return 301 https://$host$request_uri;