From bdffd6297167e9558749129bbb86749c6a5e11d8 Mon Sep 17 00:00:00 2001
From: Leandro Facchinetti <git@leafac.com>
Date: Thu, 19 Mar 2020 12:03:01 -0400
Subject: [PATCH] .

---
 src/index.tsx | 50 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/index.tsx b/src/index.tsx
index 398c4f7..38dcacb 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,4 +1,6 @@
 import express from "express";
+import http from "http";
+import https from "https";
 import { SMTPServer } from "smtp-server";
 import mailparser from "mailparser";
 import React from "react";
@@ -65,26 +67,40 @@ const emailApp = new SMTPServer({
   }
 });
 
-export const webServer = webApp.listen(
-  process.env.NODE_ENV === "production" ? 80 : 8000
-);
+export const webServer = http.createServer(webApp);
+export const emailServer = emailApp;
+
 if (process.env.NODE_ENV === "production") {
-  webApp.use((req, res, next) => {
-    if (
-      req.protocol !== "https" ||
-      req.hostname !== "www.kill-the-newsletter.com"
+  const productionWebApp = express()
+    .use((req, res, next) => {
+      if (
+        req.protocol !== "https" ||
+        req.hostname !== "www.kill-the-newsletter.com"
+      )
+        return res.redirect(
+          301,
+          `https://www.kill-the-newsletter.com${req.originalUrl}`
+        );
+      next();
+    })
+    .use(webApp);
+  const credentials = {
+    key: fs.readFileSync(
+      "/etc/letsencrypt/live/kill-the-newsletter.com/privkey.pem",
+      "utf8"
+    ),
+    cert: fs.readFileSync(
+      "/etc/letsencrypt/live/kill-the-newsletter.com/cert.pem",
+      "utf8"
     )
-      return res.redirect(
-        301,
-        `https://www.kill-the-newsletter.com${req.originalUrl}`
-      );
-    next();
-  });
-  webApp.listen(443);
+  };
+  http.createServer(productionWebApp).listen(80);
+  https.createServer(productionWebApp).listen(443);
+  emailServer.listen(25);
+} else {
+  webServer.listen(8000);
+  emailServer.listen(2525);
 }
-export const emailServer = emailApp.listen(
-  process.env.NODE_ENV === "production" ? 25 : 2525
-);
 
 type Inbox = {
   name: string;