Skip to content

Commit

Permalink
Revert "Use SSL"
Browse files Browse the repository at this point in the history
This reverts commit 096d582.
  • Loading branch information
tjwelde committed Dec 12, 2017
1 parent 096d582 commit 5f7f4f5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
6 changes: 2 additions & 4 deletions example.settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"clientID": "<github clientID>",
"clientSecret": "<github clientSecret>",
"ssl_cert": "<path to cert.pem>",
"ssl_key": "<path to key.pem>"
"clientID": "<insert github clientID>",
"clientSecret": "insert github clientSecret"
}
13 changes: 3 additions & 10 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand All @@ -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)
})

0 comments on commit 5f7f4f5

Please sign in to comment.