about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorAlan Pearce2017-06-30 17:37:20 +0200
committerAlan Pearce2017-06-30 17:37:20 +0200
commit562b0533300ad5ad8cf4695aa7fc2b844b918169 (patch)
tree96ab4a7e838d4e7d8b06fc08eaa351ba58992721 /src
parent136ebe22452c0015770d9f0ac9d94d8941461816 (diff)
downloadhomestead-562b0533300ad5ad8cf4695aa7fc2b844b918169.tar.lz
homestead-562b0533300ad5ad8cf4695aa7fc2b844b918169.tar.zst
homestead-562b0533300ad5ad8cf4695aa7fc2b844b918169.zip
feat: load config from cwd and merge with defaults
Diffstat (limited to 'src')
-rw-r--r--src/modules/config.js18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/modules/config.js b/src/modules/config.js
index 461945d..72d1b1a 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -1,10 +1,14 @@
-'use strict'
+"use strict";
 
-const TOML = require('toml')
-const config = require('configly')
+const path = require("path");
+const TOML = require("toml");
+const config = require("configly");
 
-module.exports = config({
-  parsers: {
-    toml: TOML.parse
+module.exports = config(
+  ["./config", path.resolve(__dirname, "../../config/")],
+  {
+    parsers: {
+      toml: TOML.parse
+    }
   }
-})
+);