From 8887961d09e9e646f1b0cd9f737293bd6df86063 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sun, 6 Dec 2020 20:39:43 +1300
Subject: [PATCH] Add config items

Add config items and default values:
- web_port (8001)
- environment (local)
---
 config/default.json | 3 ++-
 server.js           | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/config/default.json b/config/default.json
index daf77e82e..ff148ca32 100644
--- a/config/default.json
+++ b/config/default.json
@@ -2,5 +2,6 @@
 	"host" : "homebrewery.local.naturalcrit.com:8000",
 	"naturalcrit_url" : "local.naturalcrit.com:8010",
 	"secret" : "secret",
-	"web_port" : 8000
+	"web_port" : 8001,
+	"environment" : "local"
 }
diff --git a/server.js b/server.js
index 5528a3762..58f29884a 100644
--- a/server.js
+++ b/server.js
@@ -27,6 +27,11 @@ const config = require('nconf')
 	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
 	.file('defaults', { file: 'config/default.json' });
 
+if ( !process.env.NODE_ENV && config.get('environment') ) {
+	process.env.NODE_ENV = config.get('environment');
+	console.log('NODE_ENV set from config')
+}
+
 //DB
 const mongoose = require('mongoose');
 mongoose.connect(config.get('mongodb_uri') || config.get('mongolab_uri') || 'mongodb://localhost/naturalcrit',