From 157d453d4351e3686aff419774afaa8717978285 Mon Sep 17 00:00:00 2001
From: Ville Koivunen <ville.koivunen@hel.fi>
Date: Mon, 4 Dec 2017 11:27:11 +0200
Subject: [PATCH] Make server configuration work by instatiating a separate
 instance of nconf

---
 server/getSettings.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/getSettings.js b/server/getSettings.js
index 864e93f7a..b645e67e7 100644
--- a/server/getSettings.js
+++ b/server/getSettings.js
@@ -12,13 +12,16 @@ const defaults = {
 const configKeys = ["port", "publicUrl", "helsinkiAuthId", "helsinkiAuthSecret", "helsinkiTargetApp", "sessionSecret"];
 
 export default function getOptions() {
-    const nconf = require('nconf');
+    let nconf = require('nconf');
+    // We do not want the singleton, as webpack conf also uses nconf
+    // with its own defaults
+    nconf = new nconf.Provider();
 
     nconf.env(configKeys)
-    nconf.defaults(defaults)
     if(process.env.NODE_ENV == 'development') {
         nconf.file({file: 'config_dev.json'})
     }
+    nconf.defaults(defaults);
 
     nconf.required(configKeys)