From bfb3ae41cefc8cec9568faa82b86d5189fbabb73 Mon Sep 17 00:00:00 2001
From: Cameron Clough <cameronjclough@gmail.com>
Date: Fri, 21 Jan 2022 00:57:28 +0000
Subject: [PATCH] remove more tls stuff

---
 config.sample.js          |  5 -----
 websocket/athena/index.js | 17 ++++-------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/config.sample.js b/config.sample.js
index 2bb4953..751bb41 100644
--- a/config.sample.js
+++ b/config.sample.js
@@ -8,11 +8,6 @@ const config = {
   httpInterface: '0.0.0.0',
   httpPort: 3000,
 
-  httpsInterface: '0.0.0.0',
-  httpsPort: 4430,
-  sslKey: 'certs/retropilot.key',
-  sslCrt: 'certs/retropilot.crt',
-
   canSendMail: true, // Skips sending mail, all attempted mail is logged under DEBUG
   smtpHost: 'localhost', // credentials for smtp server to send account registration mails. if not filled in, get the generated tokens from the server.log manually
   smtpPort: 25,
diff --git a/websocket/athena/index.js b/websocket/athena/index.js
index 78b86ef..a8473f8 100644
--- a/websocket/athena/index.js
+++ b/websocket/athena/index.js
@@ -1,9 +1,9 @@
-import WebSocket, { WebSocketServer } from 'ws'; import cookie from 'cookie';
+import { WebSocketServer } from 'ws';
+import cookie from 'cookie';
 import jsonwebtoken from 'jsonwebtoken';
-import httpsServer from 'https';
 import httpServer from 'http';
-import { readFileSync } from 'fs';
 import log4js from 'log4js';
+
 import models from '../../models/index.model';
 import config from '../../config';
 import helperFunctions from './helpers';
@@ -19,16 +19,7 @@ let helpers;
 let wss;
 
 function __server() {
-  let server;
-
-  if (config.athena.secure) {
-    server = httpsServer.createServer({
-      cert: readFileSync(config.sslCrt),
-      key: readFileSync(config.sslKey),
-    });
-  } else {
-    server = httpServer.createServer();
-  }
+  const server = httpServer.createServer();
 
   wss = new WebSocketServer({ server }, { path: '/ws/v2/', handshakeTimeout: 500 });