Merge branch 'useHTTPS' into beta

1 files changed, 9 insertions, 4 deletions

diff --git a/bin/www b/bin/www
index ef9dae5..8da634f 100755
--- a/bin/www
+++ b/bin/www
@@ -5,9 +5,14 @@ const app = require('../app')
 const http = require('http')
 const https = require('https')
 
+const fileLocations = {
+  cert: '/etc/letsencrypt/live/rooster.hetmml.nl/fullchain.pem',
+  privkey: '/etc/letsencrypt/live/rooster.hetmml.nl/privkey.pem'
+}
+
 function setupHTTPS () {
-  const certificate = fs.readFileSync('/etc/letsencrypt/live/rooster.hetmml.nl/fullchain.pem', 'utf8')
-  const privateKey = fs.readFileSync('/etc/letsencrypt/live/rooster.hetmml.nl/privkey.pem', 'utf8')
+  const certificate = fs.readFileSync(fileLocations.cert, 'utf8')
+  const privateKey = fs.readFileSync(fileLocations.privkey, 'utf8')
   const credentials = { key: privateKey, cert: certificate }
 
   const httpsPort = normalizePort(process.env.PORT_HTTPS || '3001')
@@ -88,7 +93,7 @@ function onListening (server) {
 
 let useHTTPS = true
 try {
-  fs.accessSync('/etc/letsencrypt/live/rooster.hetmml.nl/privkey.pem')
+  fs.accessSync(fileLocations.privkey)
 } catch (e) {
   useHTTPS = false
 }
@@ -102,7 +107,7 @@ if (useHTTPS) {
     setupHTTP()
   }
 } else {
-  console.warn('NOT USING HTTPS! Could not read /etc/letsencrypt/live/rooster.hetmml.nl/privkey.pem')
+  console.warn(`NOT USING HTTPS! Could not read ${fileLocations.privkey}`)
   setupHTTP()
 }