Fix JSON/YAML overrides

haraka · May 11, 2024 · a62e13c · a62e13c
1 parent b19b432
commit a62e13c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/config.js b/config.js
@@ -157,3 +157,6 @@ function merge_struct(defaults, overrides) {
   }
   return defaults
 }
+
+// Load smtp.json or smtp.yaml as early as possible
+module.exports.get('smtp.json');
diff --git a/lib/reader.js b/lib/reader.js
@@ -245,7 +245,9 @@ class Reader {
       const fn = key.substr(1)
       // Overwrite the config cache for this filename
       console.log(`Overriding file ${fn} with config from ${name}`)
-      this._config_cache[path.join(cp, fn)] = result[key]
+      const cache_key = path.join(cp, fn)
+      this._overrides[cache_key] = true
+      this._config_cache[cache_key] = result[key]
     }
   }
 }