Merge pull request #11436 from AadityaPrakash/meteor-config

Implemented merge option for default and local settings.

bigbluebutton-html5/imports/startup/server/settings.js

@@ -2,12 +2,21 @@
 import { Meteor } from 'meteor/meteor';
 import fs from 'fs';
 import YAML from 'yaml';
+import _ from 'lodash';
+
+const DEFAULT_SETTINGS_FILE_PATH = process.env.BBB_HTML5_SETTINGS || 'assets/app/config/settings.yml';
+const LOCAL_SETTINGS_FILE_PATH = process.env.BBB_HTML5_LOCAL_SETTINGS || '/etc/bigbluebutton/bbb-html5.yml';
 
-const YAML_FILE_PATH = process.env.BBB_HTML5_SETTINGS || 'assets/app/config/settings.yml';
 
 try {
-  if (fs.existsSync(YAML_FILE_PATH)) {
-    const SETTINGS = YAML.parse(fs.readFileSync(YAML_FILE_PATH, 'utf-8'));
+  if (fs.existsSync(DEFAULT_SETTINGS_FILE_PATH)) {
+    const SETTINGS = YAML.parse(fs.readFileSync(DEFAULT_SETTINGS_FILE_PATH, 'utf-8'));
+
+    if (fs.existsSync(LOCAL_SETTINGS_FILE_PATH)) {
+      console.log('Local configuration found! Merging with default configuration...');
+      const LOCAL_CONFIG = YAML.parse(fs.readFileSync(LOCAL_SETTINGS_FILE_PATH, 'utf-8'));
+      _.merge(SETTINGS, LOCAL_CONFIG);
+    } else console.log('Local Configuration not found! Loading default configuration...');
 
     Meteor.settings = SETTINGS;
     Meteor.settings.public.app.instanceId = ''; // no longer use instanceId in URLs. Likely permanent change