From 24f5fcb5a0f3e1f6bcb91a035c9a76385deac353 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sun, 3 Jan 2021 23:57:43 +1300
Subject: [PATCH] Move NODE_ENV to service file; remove from server.js and
 config/default.json

---
 config/default.json      | 1 -
 freebsd/rc.d/homebrewery | 2 ++
 server.js                | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/default.json b/config/default.json
index ff148ca32..d7b5fc31d 100644
--- a/config/default.json
+++ b/config/default.json
@@ -3,5 +3,4 @@
 	"naturalcrit_url" : "local.naturalcrit.com:8010",
 	"secret" : "secret",
 	"web_port" : 8001,
-	"environment" : "local"
 }
diff --git a/freebsd/rc.d/homebrewery b/freebsd/rc.d/homebrewery
index aff7670ff..2f921b9f6 100644
--- a/freebsd/rc.d/homebrewery
+++ b/freebsd/rc.d/homebrewery
@@ -36,6 +36,8 @@ pidfile="/var/run/${program_name}.pid" 	   # File that allows the system to keep
 
 # Env Setup
 export HOME=$( getent passwd "homebrewery_runAs" | cut -d: -f6 ) # Gets the home directory of the runAs user
+export NODE_ENV="local"
+export PORT=8001
 
 # Command Setup
 exec_cmd="${location}/${program_name}/server.js" 	# Path to the HomeBrewery server.js, /usr/local/bin/ when installed globally
diff --git a/server.js b/server.js
index fdca3193a..5528a3762 100644
--- a/server.js
+++ b/server.js
@@ -27,8 +27,6 @@ const config = require('nconf')
 	.file('environment', { file: `config/${process.env.NODE_ENV}.json` })
 	.file('defaults', { file: 'config/default.json' });
 
-if(!process.env.NODE_ENV) {process.env.NODE_ENV = (config.get('environment') || 'local');}
-
 //DB
 const mongoose = require('mongoose');
 mongoose.connect(config.get('mongodb_uri') || config.get('mongolab_uri') || 'mongodb://localhost/naturalcrit',