Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewyatesg committed Apr 9, 2018
2 parents 88982aa + 038a493 commit 174d901
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ const express = require('express'),
PropertiesReader = require('properties-reader'),
multer = require('multer'),
path = require('path'),
fs = require('fs'),
https = require('https'),
passport = require('passport');
const app = express();

Expand Down Expand Up @@ -61,6 +63,12 @@ app.use(function (err, req, res, next) {
res.json({ error: err.message });
});

app.listen(3001, ()=>{
console.log('API listening on port 3001');
});
let options = {
key: fs.readFileSync('privateKey.key'),
cert: fs.readFileSync('certificate.crt')
};
https.createServer(options, app).listen(3001);

// app.listen(3001, ()=>{
// console.log('API listening on port 3001');
// });

0 comments on commit 174d901

Please sign in to comment.