surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added HTTPS to express

Browse Source
This commit is contained in:
Paolo Arena
2018-12-27 20:09:40 +01:00
parent 06cd4b8f0d
commit 46ccddc764
5 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env.production
View File

@@ -1,10 +1,11 @@
DATABASE =FreePlanet DATABASE =FreePlanet
TEST_ATTIVO=1 TEST_ATTIVO=1
PORT=3000 PORT=3000
URLBASE_APP1=http://freeplanet.app URLBASE_APP1=https://freeplanet.app
PORT_APP1=80 PORT_APP1=80
DOMAIN=mongodb://localhost:27017/ DOMAIN=mongodb://localhost:27017/
SIGNCODE=abc123 SIGNCODE=abc123
EMAIL_FROM=perseo774.un@gmail.com EMAIL_FROM=perseo774.un@gmail.com
EMAIL_PW=passpao1UNOK EMAIL_PW=passpao1UNOK
SEND_EMAIL="0" SEND_EMAIL="0"
DEBUG=true

3
ecosystem.config.js
View File

@@ -3,13 +3,14 @@ module.exports = {
{ {
name: "FreePlanetServerSide", name: "FreePlanetServerSide",
script: "./server/server.js", script: "./server/server.js",
ignore_watch : ["node_modules"],
watch: true, watch: true,
env: { env: {
"PORT": 3000, "PORT": 3000,
"NODE_ENV": "development" "NODE_ENV": "development"
}, },
env_production: { env_production: {
"PORT": 8080, "PORT": 3000,
"NODE_ENV": "production", "NODE_ENV": "production",
} }
} }

2
server/config/config.js
View File

@@ -1,5 +1,5 @@
// still in app.js // still in app.js
const node_env = process.env.NODE_ENV || 'development'; const node_env = process.env.NODE_ENV || 'production';
var file = `.env.${node_env}`; var file = `.env.${node_env}`;
// GLOBALI (Uguali per TUTTI) // GLOBALI (Uguali per TUTTI)

2
server/models/user.js
View File

@@ -8,6 +8,8 @@ const _ = require('lodash');
// Resolving error Unknown modifier: $pushAll // Resolving error Unknown modifier: $pushAll
mongoose.plugin(schema => { schema.options.usePushEach = true }); mongoose.plugin(schema => { schema.options.usePushEach = true });
mongoose.set('debug', process.env.DEBUG);
var UserSchema = new mongoose.Schema({ var UserSchema = new mongoose.Schema({
email: { email: {
type: String, type: String,

37
server/server.js
View File

@@ -2,8 +2,25 @@ require('./config/config');
const _ = require('lodash'); const _ = require('lodash');
const cors = require('cors'); const cors = require('cors');
var express = require('express'),
i18n = require("i18n"); var fs = require('fs');
var http = require('http');
var https = require('https');
const port = process.env.PORT;
if (process.env.PROD) {
var privateKey = fs.readFileSync('sslcert/server.key', 'utf8');
var certificate = fs.readFileSync('sslcert/server.crt', 'utf8');
var credentials = {key: privateKey, cert: certificate};
porthttp = port + 1
}else{
porthttp = port
}
var express = require('express');
var i18n = require("i18n");
console.log("DB: " + process.env.DATABASE); console.log("DB: " + process.env.DATABASE);
@@ -37,7 +54,6 @@ app.use(cors({
exposedHeaders: ['x-auth'], exposedHeaders: ['x-auth'],
})); }));
const port = process.env.PORT;
app.use(bodyParser.json()); app.use(bodyParser.json());
@@ -259,9 +275,18 @@ app.delete('/users/me/token', authenticate, (req, res) => {
}); });
}); });
app.listen(port, () => { var httpServer = http.createServer(app);
console.log(`Server started at port ${port}`); var httpsServer = https.createServer(credentials, app);
});
httpServer.listen(porthttp);
if (process.env.PROD) {
httpsServer.listen(port);
}
//app.listen(port, () => {
// console.log(`Server started at port ${port}`);
//});
module.exports = { app }; module.exports = { app };