chore(core): start of migrating config to yml

Author: polonel

.gitignore

@@ -31,6 +31,7 @@ node_modules
 #custom
 package-lock.json
 config.json
+config.yml
 import.csv
 /src/mailer/templates/promo/
 *.pem

.yarnclean

@@ -6,7 +6,7 @@ powered-test
 
 # asset directories
 docs
-doc
+#doc
 website
 
 # examples

app.js

@@ -46,7 +46,7 @@ if (!process.env.FORK) {
   winston.info('Server Time: ' + new Date())
 }
 
-let configFile = path.join(__dirname, '/config.json')
+let configFile = path.join(__dirname, '/config.yml')
 
 nconf.defaults({
   base_dir: __dirname,
@@ -75,7 +75,8 @@ if (nconf.get('install') || (!configExists && !isDocker)) {
 
 function loadConfig () {
   nconf.file({
-    file: configFile
+    file: configFile,
+    format: require('nconf-yaml')
   })
 }
 

package.json

@@ -76,6 +76,7 @@
     "mongoose-autopopulate": "0.16.0",
     "mongoose-lean-virtuals": "0.9.0",
     "nconf": "0.12.0",
+    "nconf-yaml": "1.0.2",
     "netmask": "2.0.2",
     "node-cache": "5.1.2",
     "node-sass": "7.0.1",
@@ -121,7 +122,8 @@
     "util": "0.12.4",
     "velocity-react": "1.4.3",
     "winston": "3.6.0",
-    "xss": "1.0.10"
+    "xss": "1.0.10",
+    "yaml": "2.1.1"
   },
   "devDependencies": {
     "@babel/core": "7.17.4",

src/controllers/install.js

@@ -91,8 +91,8 @@ installController.existingdb = function (req, res) {
   // Write Configfile
   const fs = require('fs')
   const chance = new Chance()
-  const configFile = path.join(__dirname, '../../config.json')
-
+  const configFile = path.join(__dirname, '../../config.yml')
+  const YAML = require('yaml')
   const conf = {
     mongo: {
       host: host,
@@ -107,7 +107,7 @@ installController.existingdb = function (req, res) {
     }
   }
 
-  fs.writeFile(configFile, JSON.stringify(conf, null, 4), function (err) {
+  fs.writeFile(configFile, YAML.stringify(conf), function (err) {
     if (err) {
       winston.error('FS Error: ' + err.message)
       return res.status(400).json({ success: false, error: err.message })

src/settings/defaults.js

@@ -592,11 +592,11 @@ function elasticSearchConfToDB (callback) {
   const nconf = require('nconf')
   const elasticsearch = {
     enable: nconf.get('elasticsearch:enable') || false,
-    host: nconf.get('elasticsearch:host'),
-    port: nconf.get('elasticsearch:port')
+    host: nconf.get('elasticsearch:host') || "",
+    port: nconf.get('elasticsearch:port') || 9200
   }
 
-  nconf.set('elasticsearch', undefined)
+  nconf.set('elasticsearch', {})
 
   async.parallel(
     [

yarn.lock

@@ -8800,7 +8800,7 @@ [email protected], js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-js-yaml@^3.13.1, js-yaml@~3.14.0:
+js-yaml@^3.13.1, js-yaml@^3.2.3, js-yaml@~3.14.0:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -10592,6 +10592,13 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+[email protected]:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nconf-yaml/-/nconf-yaml-1.0.2.tgz#fea065333cf42b77a5e8060517969799d4156575"
+  integrity sha1-/qBlMzz0K3el6AYFF5aXmdQVZXU=
+  dependencies:
+    js-yaml "^3.2.3"
+
 [email protected]:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.12.0.tgz#9cf70757aae4d440d43ed53c42f87da18471b8bf"
@@ -15977,6 +15984,11 @@ [email protected]:
   dependencies:
     "@babel/runtime" "^7.8.7"
 
+[email protected]:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.1.1.tgz#1e06fb4ca46e60d9da07e4f786ea370ed3c3cfec"
+  integrity sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==
+
 yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.1:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"