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

Added HTTPS to express

Browse Source 
check registration send email: OK
This commit is contained in:
Paolo Arena
2018-12-27 21:03:42 +01:00
parent 46ccddc764
commit de00989ea6
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.env.production
View File

@@ -2,10 +2,12 @@ DATABASE =FreePlanet
TEST_ATTIVO=1
PORT=3000
URLBASE_APP1=https://freeplanet.app
PORT_APP1=80
PORT_APP1="0"
DOMAIN=mongodb://localhost:27017/
SIGNCODE=abc123
EMAIL_FROM=perseo774.un@gmail.com
EMAIL_PW=passpao1UNOK
SEND_EMAIL="0"
SEND_EMAIL="1"
DEBUG=true
PATH_CERT_KEY=/etc/letsencrypt/live/freeplanet.app/privkey.pem
PATH_SERVER_CRT=/etc/letsencrypt/live/freeplanet.app/fullchain.pem

7
server/sendemail.js
View File

@@ -22,8 +22,8 @@ var smtpTransport = nodemailer.createTransport({
});
function checkifSendEmail() {
//return process.env.SEND_EMAIL === "1";
return false;
return process.env.SEND_EMAIL === "1";
//return false;
}
module.exports = {
@@ -87,7 +87,8 @@ module.exports = {
},
getHostByIdApp: function (idapp) {
if (idapp === 1) {
return process.env.URLBASE_APP1 + ':' + process.env.PORT_APP1;
let siteport = (process.env.PORT_APP1 !== "0") ? (':' + process.env.PORT_APP1) : "";
return process.env.URLBASE_APP1 + siteport;
}else{
return ""
}

18
server/server.js
View File

@@ -9,20 +9,18 @@ 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 express = require('express');
i18n = require("i18n");
if (process.env.NODE_ENV === 'production') {
var privateKey = fs.readFileSync(process.env.PATH_CERT_KEY, 'utf8');
var certificate = fs.readFileSync(process.env.PATH_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("PORT: " + process.env.PORT);
console.log("MONGODB_URI: " + process.env.MONGODB_URI);
@@ -278,8 +276,10 @@ app.delete('/users/me/token', authenticate, (req, res) => {
var httpServer = http.createServer(app);
var httpsServer = https.createServer(credentials, app);
console.log("httpServer: port ", porthttp);
httpServer.listen(porthttp);
if (process.env.PROD) {
if (process.env.NODE_ENV === 'production') {
console.log("httpsServer: port ", port);
httpsServer.listen(port);
}