lib/rubyfox/server/data/config/admin/descriptors/config_server.txt in rubyfox-server-2.17.3.2 vs lib/rubyfox/server/data/config/admin/descriptors/config_server.txt in rubyfox-server-2.19.2.0
- old
+ new
@@ -65,11 +65,12 @@
},
"dataProvider":"TCP,UDP"
}
],
"listValues":{$List=socketAddresses, instance=serverSettings, fields=address;port;type},
- "clazz":"ServerSettings$SocketAddress"
+ "clazz":"ServerSettings$SocketAddress",
+ "denyEmpty":true
},
// SESSION MAX IDLE TIME
{
"name":"sessionMaxIdleTime",
@@ -332,21 +333,21 @@
// ENABLE HTTP MODULE
{
"name":"webServer.enableHttp",
"label":"Enable HTTP",
- "tooltip":"Enable/disable the HTTP module in the embedded web server",
+ "tooltip":"Enable/disable the HTTP connector in the embedded web server",
"category":"Web Server",
"type":"CheckBox",
"value":{$BasicValue=webServer.enableHttp}
},
// HTTP/WS PORT
{
"name":"webServer.httpPort",
"label":"HTTP/WS port",
- "tooltip":"TCP port used by the embedded web server for HTTP and WS communication\n\n<b>NOTE</b>\nThe entered value is ignored if HTTP module is disabled",
+ "tooltip":"TCP port used by the embedded web server for HTTP and WS communication\n\n<b>NOTE</b>\nThe entered value is ignored if HTTP connector is disabled",
"category":"Web Server",
"type":"NumericStepper",
"value":{$BasicValue=webServer.httpPort},
"componentParams": // DEPRECATED
{
@@ -358,25 +359,55 @@
"min":0,
"max":65535
}
},
+// MAX HTTP THREADS
+{
+ "name":"webServer.maxHttpThreads",
+ "label":"Maximum HTTP threads",
+ "tooltip":"The maximum number of request processing threads to be created by the web server HTTP connector, which therefore determines the maximum number of simultaneous requests that can be handled",
+ "category":"Web Server",
+ "type":"NumericStepper",
+ "value":{$BasicValue=webServer.maxHttpThreads},
+ "attributes":
+ {
+ "min":1,
+ "max":2147483648
+ }
+},
+
+// MAX HTTP CONNECTIONS
+{
+ "name":"webServer.maxHttpConnections",
+ "label":"Maximum HTTP connections",
+ "tooltip":"The maximum number of HTTP connections that the web server will accept and process at any given time",
+ "category":"Web Server",
+ "type":"NumericStepper",
+ "value":{$BasicValue=webServer.maxHttpConnections},
+ "attributes":
+ {
+ "min":1,
+ "max":2147483648
+ }
+},
+
// ENABLE HTTPS MODULE
{
"name":"webServer.enableHttps",
"label":"Enable HTTPS",
- "tooltip":"Enable/disable the HTTPS module in the embedded web server",
+ "tooltip":"Enable/disable the HTTPS connector in the embedded web server",
"category":"Web Server",
"type":"CheckBox",
"value":{$BasicValue=webServer.enableHttps}
},
// HTTPS/WSS PORT
{
"name":"webServer.httpsPort",
"label":"HTTPS/WSS port",
- "tooltip":"TCP port used by the embedded web server for HTTPS and WSS communication\n\n<b>NOTE</b>\nThe entered value is ignored if HTTPS module is disabled",
+ "tooltip":"TCP port used by the embedded web server for HTTPS and WSS communication\n\n<b>NOTE</b>\nThe entered value is ignored if HTTPS connector is disabled",
"category":"Web Server",
"type":"NumericStepper",
"value":{$BasicValue=webServer.httpsPort},
"componentParams": // DEPRECATED
{
@@ -388,15 +419,45 @@
"min":0,
"max":65535
}
},
+// MAX HTTPS THREADS
+{
+ "name":"webServer.maxHttpsThreads",
+ "label":"Maximum HTTPS threads",
+ "tooltip":"The maximum number of request processing threads to be created by the web server HTTPS connector, which therefore determines the maximum number of simultaneous requests that can be handled",
+ "category":"Web Server",
+ "type":"NumericStepper",
+ "value":{$BasicValue=webServer.maxHttpsThreads},
+ "attributes":
+ {
+ "min":1,
+ "max":2147483648
+ }
+},
+
+// MAX HTTPS CONNECTIONS
+{
+ "name":"webServer.maxHttpsConnections",
+ "label":"Maximum HTTPS connections",
+ "tooltip":"The maximum number of HTTPS connections that the web server will accept and process at any given time",
+ "category":"Web Server",
+ "type":"NumericStepper",
+ "value":{$BasicValue=webServer.maxHttpsConnections},
+ "attributes":
+ {
+ "min":1,
+ "max":2147483648
+ }
+},
+
// ENABLE WS/WSS COMMUNICATION
{
"name":"webServer.isWSActive",
"label":"Enable WS/WSS",
- "tooltip":"Enable/disable the WebSocket communication (both WS and WSS) through the HTTP/S modules; requires one of the two modules (or both) to be active",
+ "tooltip":"Enable/disable the WebSocket communication (both WS and WSS) through the HTTP/S modules; requires one of the two connectors (or both) to be active",
"category":"Web Server",
"type":"CheckBox",
"value":{$BasicValue=webServer.isWSActive}
},
@@ -471,11 +532,11 @@
// BLUEBOX POLLING TIMEOUT
{
"name":"webServer.blueBoxPollingTimeout",
"label":"BlueBox polling timeout",
- "tooltip":"The amount of seconds after which a client connected through the BlueBox is considered disconnected if he doesn't send a polling request",
+ "tooltip":"The amount of seconds after which a client connected through the BlueBox is considered disconnected if it doesn't send a polling request",
"category":"Web Server",
"type":"NumericStepper",
"value":{$BasicValue=webServer.blueBoxPollingTimeout},
"componentParams": // DEPRECATED
{
@@ -488,11 +549,11 @@
"max":40
},
"separator":
{
"pos":"before",
- "text":"\n<b>BlueBox Settings</b>"
+ "text":"<hr><b>BlueBox Settings</b>"
}
},
// BLUEBOX MESSAGES QUEUE SIZE
{
@@ -610,20 +671,31 @@
{
"type":"password"
}
},
+// USE SSL
+{
+ "name":"mailer.useSSL",
+ "label":"Use SSL",
+ "tooltip":"Enable/disable SSL. We recommend keeping it turned on!",
+ "category":"Mailer",
+ "type":"CheckBox",
+ "value":{$BasicValue=mailer.useSSL}
+},
+
//-------------------------------------------
// REMOTE ADMIN
//-------------------------------------------
// ADMINISTRATORS
{
"name":"remoteAdmin.administrators",
"label":"Administrators",
- "tooltip":"The access credentials and permissions of SmartFoxServer administrators; removing all the administrators will prevent the AdminTool to reconnect to the server instance after a disconnection",
+ "tooltip":"The access credentials and permissions of SmartFoxServer administrators; removing all the administrators is not permitted as this would prevent further interacting with the server after the configuration submission",
"category":"Remote Admin",
+ "immediate":true,
"type":"DataGrid",
"defaultListItem":
[
{
"name":"login",
@@ -669,33 +741,30 @@
"dataProvider":"{$BasicValue=adminHelper.allModules}"
}
],
"listValues":{$List=administrators, instance=remoteAdmin, fields=login;password;allowHalt;disabledModulesString},
"clazz":"AdminUser",
- "separator":
- {
- "pos":"before",
- "text":"<b>IMPORTANT</b>: all settings below, except 'Use encryption', are <b>applied immediately</b> on submission, without a server restart being required"
- }
+ "denyEmpty":true
},
// ALLOWED REMOTE ADDRESSES
{
"name":"remoteAdmin.allowedRemoteAddresses",
"label":"Allowed client IP addresses",
- "tooltip":"List of client IP address which are allowed to access the SmartFoxServer's administration; leave the list empty to skip this check on administrator login",
+ "tooltip":"List of client IP addresses or IP ranges which are allowed to access the SmartFoxServer's administration; leave the list empty to skip this check on administrator login",
"category":"Remote Admin",
+ "immediate":true,
"type":"DataGrid",
"defaultListItem":
[
{
"name":"ipAddress",
- "label":"IP address",
- "tooltip":"Client IP address",
+ "label":"IP address or range",
+ "tooltip":"Client IP address or range",
"type":"TextInput",
"value":"",
- "validator":"ip",
+ "validator":"ipRange",
"componentParams": // DEPRECATED (implicit in validator)
{
"restrict":"0-9."
}
}
@@ -704,12 +773,13 @@
},
// ADMIN TCP PORT
{
"name":"remoteAdmin.adminTcpPort",
- "label":"Administration TCP port",
- "tooltip":"TCP port number used for administration; set it to -1 to skip this check on administrator login",
+ "label":"Administration port",
+ "tooltip":"Port number used for administration; set it to -1 to skip this check on administrator login",
"category":"Remote Admin",
+ "immediate":true,
"type":"NumericStepper",
"value":{$BasicValue=remoteAdmin.adminTcpPort},
"componentParams": // DEPRECATED
{
"minimum":-1,
\ No newline at end of file