diff --git a/example.settings.json b/example.settings.json index 231ec4c..6763131 100644 --- a/example.settings.json +++ b/example.settings.json @@ -1,6 +1,4 @@ { - "clientID": "", - "clientSecret": "", - "ssl_cert": "", - "ssl_key": "" + "clientID": "", + "clientSecret": "insert github clientSecret" } \ No newline at end of file diff --git a/server.js b/server.js index 9385d98..5e44155 100644 --- a/server.js +++ b/server.js @@ -10,8 +10,6 @@ var expressSession = require('express-session') var cookieSession = require('cookie-session') var flash = require('connect-flash'); var passport = require('./config/passport') -var fs = require('fs') -var https = require('https') var routes = require('./routes') @@ -33,20 +31,15 @@ app.use(morgan('dev')) app.use(bodyParser.json()) app.use(bodyParser.urlencoded({ extended: true })) app.use(cookieParser()) -// app.use(expressSession({ secret: 'keyboard cat', resave: true, saveUninitialized: true })) -app.use(cookieSession({name: 'session', keys: ['key1', 'key2']})) //TODO: dev only +app.use(expressSession({ secret: 'keyboard cat', resave: true, saveUninitialized: true })) +// app.use(cookieSession({name: 'session', keys: ['key1', 'key2']})) //TODO: dev only app.use(flash()); app.use(passport.initialize()) app.use(passport.session()) app.use('/', routes) -var sslOptions = { - key: fs.readFileSync(settings.ssl_key), - cert: fs.readFileSync(settings.ssl_cert) -}; - -var listener = https.createServer(sslOptions, app).listen(process.env.PORT || 3000, process.env.IP || "0.0.0.0", function(){ +var listener = app.listen(process.env.PORT || 3000, process.env.IP || "0.0.0.0", function(){ var addr = listener.address() console.log("Mirror server listening at", addr.address + ":" + addr.port) }) \ No newline at end of file