Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-03-04 12:05:04 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://github.com/nylas/k2

Browse source
This commit is contained in:
Ben Gotow 2016-07-07 16:06:09 -07:00
commit 2020ee1f19
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/nylas-api/app.js
View file

@ -18,7 +18,7 @@ const server = new Hapi.Server({
},
});
server.connection({ port: process.env.PORT || 5100 });
server.connection({ port: process.env.PORT });
const plugins = [Inert, Vision, HapiBasicAuth, HapiBoom, {
register: HapiSwagger,

3
packages/nylas-dashboard/app.js
View file

@ -8,8 +8,7 @@ const path = require('path');
global.Promise = require('bluebird');
const server = new Hapi.Server();
server.connection({ port: process.env.PORT / 1 + 1 || 5101 });
server.connection({ port: process.env.PORT });
const attach = (directory) => {
const routesDir = path.join(__dirname, directory)

2
pm2-dev.yml
View file

@ -2,6 +2,7 @@ apps:
- script : packages/nylas-api/app.js
name : api
env :
PORT: 5100
DB_ENCRYPTION_ALGORITHM : "aes-256-ctr"
DB_ENCRYPTION_PASSWORD : "d6F3Efeq"
GMAIL_CLIENT_ID : "271342407743-nibas08fua1itr1utq9qjladbkv3esdm.apps.googleusercontent.com"
@ -15,6 +16,7 @@ apps:
- script : packages/nylas-dashboard/app.js
name : dashboard
env :
PORT: 5101
DB_ENCRYPTION_ALGORITHM : "aes-256-ctr"
DB_ENCRYPTION_PASSWORD : "d6F3Efeq"
- script : packages/nylas-message-processor/app.js