From fad4562612a696027d3569db1eb08476b5955037 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 22 Jul 2019 12:12:37 +0200 Subject: [PATCH 1/7] . --- config/environments/development.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/development.js b/config/environments/development.js index 0d6ba3f..25988f7 100644 --- a/config/environments/development.js +++ b/config/environments/development.js @@ -14,7 +14,7 @@ module.exports = { server: { hostname: process.env.HOSTNAME || '127.0.0.1', - port: process.env.PORT || 1337 + port: process.env.PORT || 18888 }, paginate: { From a202c7dd5a0532adde701a582a2cb9625e8decb4 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 22 Jul 2019 12:20:08 +0200 Subject: [PATCH 2/7] . --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 880ef53..fdc734f 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "main": "server.js", "scripts": { "start": "NODE_ENV=development nodemon server.js", - "start:prod": "NODE_ENV=production pm2 start server.js -n 'api' -i 0", + "start:prod": "NODE_ENV=production pm2 start server.js -n 'api2' -i 0", "lint": "eslint **/*.js --quiet", "test": "echo \"Error: no test specified\" && exit 1" }, From 713ed63d27b70bd661a6c09ce46b9777e725fecc Mon Sep 17 00:00:00 2001 From: david Date: Mon, 22 Jul 2019 12:22:18 +0200 Subject: [PATCH 3/7] . --- config/environments/production.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/production.js b/config/environments/production.js index 9ea138f..43d7f12 100644 --- a/config/environments/production.js +++ b/config/environments/production.js @@ -22,6 +22,6 @@ module.exports = { server: { hostname: process.env.HOSTNAME || '127.0.0.1', - port: process.env.PORT || 80 + port: process.env.PORT || 18888 } } From 6d999247adb41a1ccbe539730610dec3551e1eea Mon Sep 17 00:00:00 2001 From: david Date: Mon, 22 Jul 2019 12:24:51 +0200 Subject: [PATCH 4/7] . --- server.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index 0345504..f76685c 100644 --- a/server.js +++ b/server.js @@ -10,9 +10,9 @@ const { express, logger, models } = require('./core'); const currentState = assign({ launchedAt: Date.now(), appPath: process.cwd(), - host: process.env.HOST || process.env.HOSTNAME || 'localhost', - port: process.env.PORT || 1337, - environment: toLower(process.env.NODE_ENV) || 'development', + //host: process.env.HOST || process.env.HOSTNAME || 'localhost', + //port: process.env.PORT || 18888, + //environment: toLower(process.env.NODE_ENV) || 'development', connections: {} }, config); From 01ae258d54f75d398ee5a5affe5e3888dcef18bb Mon Sep 17 00:00:00 2001 From: david Date: Mon, 22 Jul 2019 12:27:26 +0200 Subject: [PATCH 5/7] . --- server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index f76685c..32fd889 100644 --- a/server.js +++ b/server.js @@ -12,7 +12,7 @@ const currentState = assign({ appPath: process.cwd(), //host: process.env.HOST || process.env.HOSTNAME || 'localhost', //port: process.env.PORT || 18888, - //environment: toLower(process.env.NODE_ENV) || 'development', + environment: toLower(process.env.NODE_ENV) || 'development', connections: {} }, config); @@ -64,7 +64,7 @@ try { logger.info('Process PID: ' + process.pid); //logger.info(`Version: ${this.config.info.strapi} (node v${this.config.info.node})`); logger.info('To shut down your server, press + C at any time'); - logger.info(`⚡️ Server: http://${currentState.host}:${currentState.port}`); + logger.info(`⚡️ Server: http://${currentState.server.host}:${currentState.server.port}`); }); }); From 91dda73b7aabf5b633137d851ca8e341d704af99 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 22 Jul 2019 12:28:14 +0200 Subject: [PATCH 6/7] . --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 32fd889..043cdb0 100644 --- a/server.js +++ b/server.js @@ -64,7 +64,7 @@ try { logger.info('Process PID: ' + process.pid); //logger.info(`Version: ${this.config.info.strapi} (node v${this.config.info.node})`); logger.info('To shut down your server, press + C at any time'); - logger.info(`⚡️ Server: http://${currentState.server.host}:${currentState.server.port}`); + logger.info(`⚡️ Server: http://${currentState.server.hostname}:${currentState.server.port}`); }); }); From b26797580ce1ce294b760eaadf5cd2558f85b9db Mon Sep 17 00:00:00 2001 From: david Date: Mon, 22 Jul 2019 13:55:33 +0200 Subject: [PATCH 7/7] . --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 043cdb0..f6df082 100644 --- a/server.js +++ b/server.js @@ -51,7 +51,7 @@ server.on('error', err => { try { models.sequelize.sync({ force: false }).then(() => { // Launch server. - server.listen(currentState.port, (err) => { + server.listen(currentState.server.port, (err) => { if (err) { logger.debug(`⚠️ Server wasn't able to start properly.`); logger.error(err);