diff --git a/.gitignore b/.gitignore index fd81f60a..f80b2b34 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ .idea *.sublime* +private.json + /node_modules /bower_components -/public \ No newline at end of file +/public diff --git a/config.js b/config.js index 1a329f32..dfc282c8 100644 --- a/config.js +++ b/config.js @@ -1,3 +1,4 @@ +var fs = require("fs"); const MENU = require("./models/menu.json"); const team = require("./models/team"); @@ -5,7 +6,10 @@ const course = require("./models/course"); const document = require("./models/document"); const schedule = require("./models/schedule"); -module.exports = { +var privateFile = process.env["PRIVATE"] || "private.json"; +var privateData = JSON.parse(fs.readFileSync(privateFile, "utf-8")); + +var config = { port: process.env["PORT"] || 3000, pub: "./", data: { @@ -19,12 +23,11 @@ module.exports = { uri: "mongodb://localhost:27017/hudozka" }, - instagram:{ - client_id: "f17901a26a5e4a5ca4544dd0eebe2a15", - client_secret: "ecce08509871427ab9f8f383318315fc", - redirect_uri: "http://home.tmshv.ru:1337/auth/instagram/callback" - }, - tags: ["shlb_hudozka"] }; - \ No newline at end of file + +module.exports = Object.keys(privateData) + .reduce(function (config, key) { + config[key] = privateData[key]; + return config; + }, config); \ No newline at end of file