split server and client settings initial loading logic

packages/rocketchat-lib/lib/startup/settings.coffee

-if Meteor.isClient is true
-	@Settings = Settings = new Meteor.Collection 'rocketchat_settings'
-else
-	Settings = RocketChat.models.Settings
-
+@Settings = Settings = new Meteor.Collection 'rocketchat_settings'
 initialLoad = true
-
-Meteor.settings ?= {}
-
-process?.env ?= {}
-
 Settings.find().observe
-
 	added: (record) ->
 		Meteor.settings[record._id] = record.value
-		process?.env[record._id] = record.value
 		RocketChat.settings.load record._id, record.value, initialLoad
-
 	changed: (record) ->
-		Meteor.settings?[record._id] = record.value
-		process?.env[record._id] = record.value
+		Meteor.settings[record._id] = record.value
 		RocketChat.settings.load record._id, record.value, initialLoad
-
 	removed: (record) ->
-		delete Meteor.settings?[record._id]
-		delete process?.env?[record._id]
+		delete Meteor.settings[record._id]
 		RocketChat.settings.load record._id, undefined, initialLoad
-
 initialLoad = false

packages/rocketchat-lib/server/startup/settings.coffee

@@ -113,12 +113,31 @@ RocketChat.settings.add 'Layout_Login_Terms', 'By proceeding to create your acco
 
 RocketChat.settings.add 'Statistics_opt_out', false, { type: 'boolean', group: false }
 
+
+initialLoad = true
+RocketChat.models.Settings.find().observe
+	added: (record) ->
+		Meteor.settings[record._id] = record.value
+		process.env[record._id] = record.value
+		RocketChat.settings.load record._id, record.value, initialLoad
+	changed: (record) ->
+		Meteor.settings[record._id] = record.value
+		process.env[record._id] = record.value
+		RocketChat.settings.load record._id, record.value, initialLoad
+	removed: (record) ->
+		delete Meteor.settings[record._id]
+		delete process.env[record._id]
+		RocketChat.settings.load record._id, undefined, initialLoad
+initialLoad = false
+
+
 Meteor.startup ->
 	if process?.env? and not process.env['MAIL_URL']? and RocketChat.settings.get('SMTP_Host') and RocketChat.settings.get('SMTP_Username') and RocketChat.settings.get('SMTP_Password')
 		process.env['MAIL_URL'] = "smtp://" + encodeURIComponent(RocketChat.settings.get('SMTP_Username')) + ':' + encodeURIComponent(RocketChat.settings.get('SMTP_Password')) + '@' + encodeURIComponent(RocketChat.settings.get('SMTP_Host'))
 		if RocketChat.settings.get('SMTP_Port')
 			process.env['MAIL_URL'] += ':' + parseInt(RocketChat.settings.get('SMTP_Port'))
 
+
 # Remove runtime settings (non-persistent)
 Meteor.startup ->
 	RocketChat.models.Settings.update({ ts: { $lt: RocketChat.settings.ts }, persistent: false }, { $set: { hidden: true } })