Dynamic configuration

README.md

@@ -68,6 +68,9 @@ If you checked out this project from github, you can find a configuration file e
 
 + Please refer to node-apn's [documentation](https://github.com/argon/node-apn) to see all the available parameters and find how to convert your certificates into the expected format. 
 
+#### Dynamic configuration
+
+You can use the "process.env.MY_ENV_VAR" syntax in the config.json file. It will automatically be replaced by the value of the corresponding environment variable. 
 
 ### 4 - Start server
 

bin/pushserver.js

@@ -49,11 +49,6 @@ _.forEach(program.override, function(valueParam){
     var key = array[0];
     var value = array[1];
 
-    var env = /^process\.env\.(.+)$/.exec(value);
-    if(env) {
-      value = process.env[env[1]];
-    }
-
     var configElement = overrideValues;
     var keys = key.split('.');
     for(var i = 0 ; i < keys.length - 1 ; i++) {

lib/Config.js

@@ -10,7 +10,17 @@ var _ = require('lodash');
 var config;
 
 var initialize = _.once(function (configFilePath, overrides) {
-    return config = _.merge({}, require(configFilePath), overrides);
+    config = _.merge({}, require(configFilePath), overrides);
+
+    // Replace any "process.env.*" by its corresponding value
+    _.forOwn(config, function(value, key){
+        var env = /^process\.env\.(.+)$/.exec(value);
+        if(env) {
+          config[key] = process.env[env[1]];
+        }
+    });
+
+    return config;
 });
 
 var get = function (key) {