pull/50/head
Alex Kern 10 years ago
parent b85f41a277
commit 73260b2221

3
.gitignore vendored

@ -34,3 +34,6 @@ css/index.css
# New Relic # New Relic
newrelic.js newrelic.js
# SSL Keys
*.pem

@ -1,15 +1,30 @@
var db = require('./db') var db = require('./db')
var express = require('express') var express = require('express')
var expressWinston = require('express-winston') var expressWinston = require('express-winston')
var forceSSL = require('express-force-ssl')
var fs = require('fs') var fs = require('fs')
var http = require('http') var http = require('http')
var https = require('https')
var ice = require('./ice') var ice = require('./ice')
var path = require('path') var path = require('path')
var socketIO = require('socket.io') var socketIO = require('socket.io')
var winston = require('winston') var winston = require('winston')
var app = express() var app = express()
var server = http.Server(app)
if (process.env.SECURE) {
var server = https.Server({
key: fs.readFileSync(process.env.SSL_KEY || 'key.pem'),
cert: fs.readFileSync(process.env.SSL_CERT || 'cert.pem')
}, app)
var port = process.env.PORT || 443
var insecurePort = process.env.INSECURE_PORT || 80
http.Server(app).listen(80)
} else {
var server = http.Server(app)
var port = process.env.PORT || (process.env.NODE_ENV === 'production' ? 80 : 3000)
}
var io = socketIO(server) var io = socketIO(server)
var logDir = path.resolve(__dirname, '../log') var logDir = path.resolve(__dirname, '../log')
@ -31,7 +46,7 @@ server.on('error', function (err) {
process.exit(1) process.exit(1)
}) })
server.listen(process.env.PORT || 3000, function (err) { server.listen(port, function (err) {
var host = server.address().address var host = server.address().address
var port = server.address().port var port = server.address().port
console.log('FilePizza listening on %s:%s', host, port) console.log('FilePizza listening on %s:%s', host, port)
@ -42,6 +57,8 @@ app.use(expressWinston.logger({
expressFormat: true expressFormat: true
})) }))
app.use(forceSSL)
app.get('/js', require('./middleware/javascript')) app.get('/js', require('./middleware/javascript'))
app.get('/css', require('./middleware/css')) app.get('/css', require('./middleware/css'))
app.use(require('./middleware/static')) app.use(require('./middleware/static'))

@ -28,6 +28,7 @@
"alt": "^0.14.4", "alt": "^0.14.4",
"classnames": "^1.2.0", "classnames": "^1.2.0",
"express": "^4.12.0", "express": "^4.12.0",
"express-force-ssl": "^0.3.0",
"express-winston": "^0.3.1", "express-winston": "^0.3.1",
"filepizza-socket": "^1.0.0", "filepizza-socket": "^1.0.0",
"newrelic": "^1.21.1", "newrelic": "^1.21.1",

Loading…
Cancel
Save