From 41ea348ee70bcd5dd9128eef9979f56229a163ae Mon Sep 17 00:00:00 2001 From: lexoyo Date: Wed, 24 Feb 2016 12:13:50 +0100 Subject: [PATCH] github app details as env vars --- .pm2.json | 4 +++- dist/server/server.js | 13 +++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.pm2.json b/.pm2.json index 77fd384ed..86fa0cfe1 100644 --- a/.pm2.json +++ b/.pm2.json @@ -5,7 +5,9 @@ "watch" : "dist/server/", "env": { "NODE_ENV": "production", - "SILEX_DEBUG": true + "SILEX_DEBUG": true, + "GITHUB_CLIENT_ID": "a173a2e4af98211d94c9", + "GITHUB_CLIENT_SECRET": "1fce6f8127611c44bafaa19c3843d890cbd479df" } }] } diff --git a/dist/server/server.js b/dist/server/server.js index 5ecb73e6d..97bc59d5a 100644 --- a/dist/server/server.js +++ b/dist/server/server.js @@ -95,7 +95,7 @@ else { } // ******************************** -// config +// unifile server // ******************************** // change www root @@ -119,15 +119,20 @@ silexConfig.staticFolders.push( } ); -// ******************************** -// unifile server -// ******************************** // open pages if defined if(silexConfig.openPages) { silexConfig.openPages.ROOT = pathModule.resolve(__dirname, '../../open-pages/'); silexConfig.openPages.SQLLITE_FILE = pathModule.resolve(__dirname, '../../open-pages/websites.sql'); fs.mkdir(silexConfig.openPages.ROOT, null, function (error) {}); } + +// github service +if(process.env.GITHUB_CLIENT_ID && process.env.GITHUB_CLIENT_SECRET) { + console.log(process.env.GITHUB_CLIENT_ID); + silexConfig.github.client_id = process.env.GITHUB_CLIENT_ID; + silexConfig.github.client_secret = process.env.GITHUB_CLIENT_SECRET; +} + // SSL certificate try { var privateKey = fs.readFileSync(process.env.SILEX_SSL_PRIVATE_KEY || __dirname + '/../../privatekey.pem').toString();