From ba3e99f009e8f577908923501a48fa09d6bc7d05 Mon Sep 17 00:00:00 2001
From: Liran Tal <liran.tal@gmail.com>
Date: Tue, 12 May 2015 09:22:04 +0300
Subject: [PATCH] implemented feature to address issue 553 - provide a local.js
 file for local development configuration parameters that will not get
 committed to remote repositories and will accidentally expose API keys,
 passwords, and sensitive local configuration

---
 .gitignore       | 1 +
 config/config.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index bca129da..c519f474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 ehthumbs.db
 Icon?
 Thumbs.db
+config/env/local.js
 
 # Node and related ecosystem
 # ==========================
diff --git a/config/config.js b/config/config.js
index ef4a4c2c..aa16f12e 100644
--- a/config/config.js
+++ b/config/config.js
@@ -11,7 +11,8 @@ var _ = require('lodash'),
  */
 module.exports = _.extend(
 	require('./env/all'),
-	require('./env/' + process.env.NODE_ENV) || {}
+	require('./env/' + process.env.NODE_ENV),
+	require('./env/local.js') || {}
 );
 
 /**