diff --git a/.env.production b/.env.production index 7ffc54f..8c58231 100644 --- a/.env.production +++ b/.env.production @@ -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 diff --git a/server/sendemail.js b/server/sendemail.js index 2d86fcc..f0f4d5b 100644 --- a/server/sendemail.js +++ b/server/sendemail.js @@ -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 "" } diff --git a/server/server.js b/server/server.js index d087a09..d5e87ac 100644 --- a/server/server.js +++ b/server/server.js @@ -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); }