Server: Default config options during build

diff --git a/client/assets/dev/build.js b/client/assets/dev/build.js
index 698bbb9a7d036cf117fc42aef0a69a50f315d65b..5fc84a29860d5bd5b8b85aca3821e646e3b0124b 100644 (file)
--- a/client/assets/dev/build.js
+++ b/client/assets/dev/build.js
@@ -83,7 +83,7 @@ console.log('kiwi.js and kiwi.min.js built');
 \r
 var index_src = fs.readFileSync(__dirname + '/index.html.tmpl', FILE_ENCODING);\r
 var vars = {\r
-    base_path: config.get().http_base_path,\r
+    base_path: config.get().http_base_path || '/kiwi',\r
     cache_buster: Math.ceil(Math.random() * 9000).toString(),\r
     server_settings: '{}',\r
     client_plugins: '[]'\r

diff --git a/server/configuration.js b/server/configuration.js
index b913db667e7ac66823f2ef7d367e4fbb2cd81470..02961ca8b22412265a9c10fdeffac75371869a29 100644 (file)
--- a/server/configuration.js
+++ b/server/configuration.js
@@ -37,7 +37,7 @@ function loadConfig() {
 
     if (new_config) {
         loaded_config = new_config;
-        global.config = new_config[environment];
+        global.config = new_config[environment] || {};
         return loaded_config;
     } else {
         return false;
@@ -54,7 +54,7 @@ module.exports.setEnvironment = function (new_environment) {
 module.exports.get = function (specific_environment) {
     specific_environment = specific_environment || environment;
     
-    return loaded_config[specific_environment];
+    return loaded_config[specific_environment] || {};
 };
 
 module.exports.loadConfig = loadConfig;
\ No newline at end of file