moved all fileupload settings to package

packages/rocketchat-file-upload/server/startup/settings.js

@@ -1,6 +1,27 @@
-Meteor.startup(function() {
-	RocketChat.settings.add('FileUpload_Storage_Type', 'GridFS', {
-		group: 'FileUpload',
+RocketChat.settings.addGroup('FileUpload', function() {
+	this.add('FileUpload_Enabled', true, {
+		type: 'boolean',
+		public: true
+	});
+
+	this.add('FileUpload_MaxFileSize', 2097152, {
+		type: 'int',
+		public: true
+	});
+
+	this.add('FileUpload_MediaTypeWhiteList', 'image/*,audio/*,application/pdf,text/plain,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document', {
+		type: 'string',
+		public: true,
+		i18nDescription: 'FileUpload_MediaTypeWhiteListDescription'
+	});
+
+	this.add('FileUpload_ProtectFiles', true, {
+		type: 'boolean',
+		public: true,
+		i18nDescription: 'FileUpload_ProtectFilesDescription'
+	});
+
+	this.add('FileUpload_Storage_Type', 'GridFS', {
 		type: 'select',
 		values: [{
 			key: 'GridFS',
@@ -12,50 +33,41 @@ Meteor.startup(function() {
 		public: true
 	});
 
-	RocketChat.settings.add('FileUpload_S3_Bucket', '', {
-		group: 'FileUpload',
-		section: 'Amazon S3',
-		type: 'string',
-		enableQuery: {
-			_id: 'FileUpload_Storage_Type',
-			value: 'AmazonS3'
-		}
-	});
-	RocketChat.settings.add('FileUpload_S3_Acl', '', {
-		group: 'FileUpload',
-		section: 'Amazon S3',
-		type: 'string',
-		enableQuery: {
-			_id: 'FileUpload_Storage_Type',
-			value: 'AmazonS3'
-		}
-	});
-	RocketChat.settings.add('FileUpload_S3_AWSAccessKeyId', '', {
-		group: 'FileUpload',
-		section: 'Amazon S3',
-		type: 'string',
-		enableQuery: {
-			_id: 'FileUpload_Storage_Type',
-			value: 'AmazonS3'
-		}
-	});
-	RocketChat.settings.add('FileUpload_S3_AWSSecretAccessKey', '', {
-		group: 'FileUpload',
-		section: 'Amazon S3',
-		type: 'string',
-		enableQuery: {
-			_id: 'FileUpload_Storage_Type',
-			value: 'AmazonS3'
-		}
-	});
-	RocketChat.settings.add('FileUpload_S3_CDN', '', {
-		group: 'FileUpload',
-		section: 'Amazon S3',
-		type: 'string',
-		enableQuery: {
-			_id: 'FileUpload_Storage_Type',
-			value: 'AmazonS3'
-		}
+	this.section('Amazon S3', function() {
+		this.add('FileUpload_S3_Bucket', '', {
+			type: 'string',
+			enableQuery: {
+				_id: 'FileUpload_Storage_Type',
+				value: 'AmazonS3'
+			}
+		});
+		this.add('FileUpload_S3_Acl', '', {
+			type: 'string',
+			enableQuery: {
+				_id: 'FileUpload_Storage_Type',
+				value: 'AmazonS3'
+			}
+		});
+		this.add('FileUpload_S3_AWSAccessKeyId', '', {
+			type: 'string',
+			enableQuery: {
+				_id: 'FileUpload_Storage_Type',
+				value: 'AmazonS3'
+			}
+		});
+		this.add('FileUpload_S3_AWSSecretAccessKey', '', {
+			type: 'string',
+			enableQuery: {
+				_id: 'FileUpload_Storage_Type',
+				value: 'AmazonS3'
+			}
+		});
+		this.add('FileUpload_S3_CDN', '', {
+			type: 'string',
+			enableQuery: {
+				_id: 'FileUpload_Storage_Type',
+				value: 'AmazonS3'
+			}
+		});
 	});
 });
-

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

@@ -74,13 +74,6 @@ RocketChat.settings.addGroup 'Accounts', ->
 		@add 'Accounts_OAuth_Twitter_callback_url', __meteor_runtime_config__?.ROOT_URL + '_oauth/twitter', { type: 'string', blocked: true }
 
 
-RocketChat.settings.addGroup 'FileUpload', ->
-	@add 'FileUpload_Enabled', true, { type: 'boolean', public: true }
-	@add 'FileUpload_MaxFileSize', 2097152, { type: 'int', public: true }
-	@add 'FileUpload_MediaTypeWhiteList', 'image/*,audio/*,application/pdf,text/plain,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document', { type: 'string', public: true, i18nDescription: 'FileUpload_MediaTypeWhiteListDescription' }
-	@add 'FileUpload_ProtectFiles', true, { type: 'boolean', public: true, i18nDescription: 'FileUpload_ProtectFilesDescription' }
-
-
 RocketChat.settings.addGroup 'General', ->
 	@add 'Site_Url', __meteor_runtime_config__?.ROOT_URL, { type: 'string', i18nDescription: 'Site_Url_Description', public: true }
 	@add 'Site_Name', 'Rocket.Chat', { type: 'string', public: true }