From f664dc6ebcfb74f703bd119e79a6005458687e63 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Sat, 17 Aug 2019 17:51:55 +1000
Subject: [PATCH] nginx stuff

---
 .../mnml.gg.PRODUCTION.nginx.conf             |  2 --
 .../mnml.gg.STAGING.SAMPLE.nginx.conf         | 32 +++++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
index 113a2b3c..875a10d7 100644
--- a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
+++ b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
@@ -1,5 +1,3 @@
-error_log /var/log/mnml/nginx.log;
-
 upstream mnml_http {
     server 127.0.0.1:40000;
 }
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 5f8e05ac..5e3fab85 100644
--- a/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
+++ b/etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
@@ -1,5 +1,3 @@
-error_log /var/log/mnml/nginx.log;
-
 upstream mnml_http {
     server 127.0.0.1:40000;
 }
@@ -17,18 +15,11 @@ map $http_upgrade $connection_upgrade {
 # DEV
 server {
     location / {
-        root /var/lib/mnml/public/client;
+        root /var/lib/mnml/public/current;
         index index.html;
         try_files $uri $uri/ index.html;
     }
 
-    # this will be handled by a separate domain
-    location /acp {
-        root /var/lib/mnml/public/acp;
-        index acp.html;
-        try_files $uri $uri/ acp.html;
-    }
-
     location /imgs/ {
         root /var/lib/mnml/public/;
         try_files $uri $uri/ =404;
@@ -54,3 +45,24 @@ server {
     include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 }
+
+server {
+    server_name grep.live;
+
+    location / {
+        root /var/lib/mnml/public/current/;
+        index acp.html;
+        try_files $uri $uri/ acp.html;
+    }
+
+    listen 443 ssl; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/grep.live/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/grep.live/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 {
+    return 301 https://$host$request_uri;
+}