diff --git a/.gitignore b/.gitignore index 721cc02..59b2c0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ node_modules -keys.js +dev.js _netrc # REACT CLIENT diff --git a/config/keys.js b/config/keys.js new file mode 100644 index 0000000..73fdb04 --- /dev/null +++ b/config/keys.js @@ -0,0 +1,9 @@ +// keys.js - figure out what set of credentials to return +// NODE_ENV - variável do Heroku que informa que estamos em production. o Heroku configura esta variável +if (process.env.NODE_ENV === "production") { + // we are in production - return the production set of keys + module.exports = require ("./prod"); +} else { + // we are in development - return the dev keys + module.exports = require("./dev"); +} diff --git a/config/prod.js b/config/prod.js new file mode 100644 index 0000000..dda3d60 --- /dev/null +++ b/config/prod.js @@ -0,0 +1,31 @@ +// prod.js - production keys here!! +// dev.js - Development keys - don't commit this!!! +module.exports = { + googleClientID: + pg: { + host: process.env.PG_HOST, // server name or IP address; + hostaddr: process.env.PG_HOST_ADDRESS, + port: process.env.PG_PORT, + database: process.env.PG_DATABASE, + user: process.env.PG_USER, + password: process.env.PG_PWD, + max: process.env.PG_MAX_NUMBER_OF_CLIENTS, // max number of clients in the pool + idleTimeoutMillis: 30000 // how long a client is allowed to remain idle before being closed + }, + msql: { + user: process.env.MSQL_USER, + password: process.env.MSQL_PWD, + server: process.env.MSQL_SERVER, // "JAVASERVER\\SQLEXPRESS", + database: process.env.MSQL_DATABASE, + port: process.env.MSQL_PORT, + dialect: "mssql" + }, + geoserverWMS: process.env.GEOSERVER_WMS, + waterLayers: process.env.WATER_LAYERS, + server: process.env.GEOSERVER_WMS, + googleClientID: process.env.GOOGLE_CLIENT_ID, + googleClientSecret: process.env.GOOGLE_CLIENT_SECRET, + mongoURI: process.env.MONGO_URI, + cookieKey: process.env.COOKIE_KEY + }; + \ No newline at end of file diff --git a/services/databases.js b/services/databases.js index d6c3d6c..66bb947 100644 --- a/services/databases.js +++ b/services/databases.js @@ -9,6 +9,6 @@ pg.defaults.poolSize = 25; global.poolPg = new pg.Pool(keys.pg); global.poolMsql = new ms_sql.ConnectionPool(keys.msql, function(err) { if (err) { - console.log("Não conectou \n" + err); + console.log("Não conectou com SQLServer:\n" + err); } }); \ No newline at end of file -- libgit2 0.21.2