diff --git a/Configuration.md b/Configuration.md index 90acf92..2d64e9c 100644 --- a/Configuration.md +++ b/Configuration.md @@ -45,13 +45,13 @@ servers:         `restricted` **[Boolean]**: Require players to have a permission to be able join the server
        `hidden` **[Boolean]** (Optional): Hide the server from server list commands like `/server`

-### [~/SubServers/config.yml](https://github.com/ME1312/SubServers-2/blob/master/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/config.yml) (Global Configuration) +### ~/SubServers/config.yml (Global Configuration) This is the main configuration file for the SubServers platform. Other add-ons use settings in this configuration in addition to their own to work properly. ``` Settings: - Version: '2.11.2a+' + Version: '00w00a' + Smart-Fallback: true Override-Bungee-Commands: true - Run-On-Launch-Timeout: 0 UPnP: Forward-Proxy: true Forward-SubData: false @@ -59,15 +59,15 @@ Settings: SubData: Address: '0.0.0.0:4391' Password: 'default' - Encryption: 'AES' - Allowed-Connections: + Encryption: 'RSA/AES' + Whitelist: - '192.168.0.6' - '192.168.1.%' ``` `Settings` **[Object]**: Settings for the SubServers.Bungee add-on
    `Version` **[Version]** (System): Configuration version
+    `Smart-Fallback` **[Boolean]**: Enables the smart confidence-based server fallback system
    `Override-Bungee-Commands` **[Boolean]**: Whether the default BungeeCord commands should be overridden by SubServers code
-    `Run-On-Launch-Timeout` **[Integer]** (Optional): The amount of seconds the auto-starter should wait for a SubData connection from a subserver before moving on to the next one
    `UPnP` **[Object]**: Automatic Port Forwarding Options
        `Forward-Proxy` **[Boolean]**: Whether or not to forward the proxy's listeners
        `Forward-SubData` **[Boolean]**: Whether or not to forward SubData
@@ -81,7 +81,11 @@ Settings:             **->** `AES-128`
            **->** `AES-192`
            **->** `AES-256`
-        `Allowed-Connections` **[Address List]**: Whitelist addresses SubServers doesn't know. Integers in each address may be replaced with the wildcard `%` to match any number. (example: `192.168.0.%`)
+            **->** `RSA/AES`: An alias for RSA-2048/AES-128
+            **->** `RSA-2048/AES-128`
+            **->** `RSA-3072/AES-192`
+            **->** `RSA-4096/AES-256`
+        `Whitelist` **[Address List]**: Whitelist addresses SubServers doesn't know. Integers in each address may be replaced with the wildcard `%` to match any number. (example: `192.168.0.%`)

``` Hosts: @@ -108,7 +112,12 @@ Hosts:         `Git-Bash` **[File Path]** (Windows Only): Path to the install location of Git Bash. This value can include system variables.
        `Log-Creator` **[Boolean]**: Whether SubCreator should log the output of it's scripts to console

+### ~/SubServers/servers.yml (Global Configuration) +This is the configuration file that defines the SubServers themselves. Other add-ons use settings in this configuration in addition to their own to work properly. ``` +Settings: + Version: '00w00a' + Override-Bungee-Commands: true Servers: 'Example': Enabled: false @@ -129,6 +138,9 @@ Servers: - 'OtherServer' Hidden: false ``` +`Settings` **[Object]**: Settings for the SubServers.Bungee add-on
+    `Version` **[Version]** (System): Configuration version
+    `Run-On-Launch-Timeout` **[Integer]** (Optional): The amount of seconds the auto-starter should wait for a SubData connection from a subserver before moving on to the next one
`Servers` **[Object]**: Settings for each SubServer
    `` **[String]**: The name of this group of settings is the name of your subserver
        `Enabled` **[Boolean]**: Whether this subserver is enabled
@@ -148,14 +160,15 @@ Servers:         `Stop-Action` **[Enum Value]**: Set what should happen after the server stops. Valid values:
            **->** `NONE`: Do nothing on stop
            **->** `RESTART`: Restart if it stopped unexpectedly
-            **->** `REMOVE_SERVER`: Remove the server on stop
-            **->** `DELETE_SERVER`: Delete the server on stop
+            **->** `REMOVE_SERVER`: Remove the server from memory on stop
+            **->** `RECYCLE_SERVER`: Move the server files 'Recently Deleted' on stop
+            **->** `DELETE_SERVER`: Delete the server files on stop
        `Run-On-Launch` **[Boolean]**: Whether this subserver will start as soon as it's loaded
        `Restricted` **[Boolean]**: Require players to have a permission to be able join the subserver
        `Incompatible` **[Enum Value List]** (Optional): List of subservers that cannot be run at the same time as this one
        `Hidden` **[Boolean]** (Optional): Hide the server from subserver list commands like `/server`

-### [~/SubServers/lang.yml](https://github.com/ME1312/SubServers-2/blob/master/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/lang.yml) (Global Language File) +### ~/SubServers/lang.yml (Global Language File) This a language file containing all messages that are visible to players. It is updated quite frequently and is pretty self explanatory in it's structure. Everything in the `Lang` object is a Colored String that you may change as needed.

### ~/SubServers/Templates/<Template Name>/template.yml @@ -165,7 +178,7 @@ SubCreator Templates have their own directory structure and template configurati ### [~/config.yml](https://github.com/ME1312/SubServers-2/blob/master/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/config.yml) ``` Settings: - Version: '2.11.2a+' + Version: '00w00a' Console-Log: true Network-Log: true Server-Bind: '127.0.0.1' @@ -173,7 +186,7 @@ Settings: Forward-Servers: false SubData: Name: 'ExampleHost' - Address: '192.168.0.2:4391' + Address: '127.0.0.1:4391' Password: 'default' Encryption: 'AES' ``` @@ -187,14 +200,13 @@ Settings:     `SubData` **[Object]**: Settings to connect to SubData with
        `Name` **[Enum Value]**: The name of the Host as defined in the global configuration. Additionally, the host specified needs to be equipped with a driver that can handle a SubData connection.
        `Address` **[Socket Address]**: The address to connect to the SubData Server with
-        `Password` **[String]**: The password to login with
-        `Encryption` **[Enum Value]**: Set which cipher to use for encrypting SubData traffic (Must match the one the server uses)
+        `Password` **[String]** (Optional): The password to login with

## SubServers.Sync ### [~/SubServers/sync.yml](https://github.com/ME1312/SubServers-2/blob/master/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Files/config.yml) ``` Settings: - Version: '2.11.2a+' + Version: '00w00a' Override-Bungee-Commands: true UPnP: Forward-Proxy: true @@ -202,7 +214,6 @@ Settings: Name: 'ExampleProxy' Address: '127.0.0.1:4391' Password: 'default' - Encryption: 'AES' ``` `Settings` **[Object]**: Settings for the SubServers.Sync add-on
    `Version` **[Version]** (System): Configuration version
@@ -212,8 +223,7 @@ Settings:     `SubData` **[Object]**: Settings to connect to SubData with
        `Name` **[String]** (Optional): The name that this proxy will be registered with. If this value is not present it will use the one from the RedisBungee configuration. If RedisBungee is not present then it will use a randomly generated UUID.
        `Address` **[Socket Address]**: The address to connect to the SubData Server with
-        `Password` **[String]**: The password to login with
-        `Encryption` **[Enum Value]**: Set which cipher to use for encrypting SubData traffic (Must match the one the server uses)
+        `Password` **[String]** (Optional): The password to login with

``` Sync: @@ -235,23 +245,21 @@ Sync: This configuration remains the same on all server platforms for ease of use. ``` Settings: - Version: '2.11.2a+' - Ingame-Access: true + Version: '00w00a' + API-Only-Mode: false Show-Addresses: false Use-Title-Messages: true SubData: Name: 'Example' Address: '127.0.0.1:4391' Password: 'default' - Encryption: 'AES' ``` `Settings` **[Object]**: Settings for the SubServers.Client plugin
    `Version` **[Version]** (System): Configuration version
-    `Ingame-Access` **[Boolean]**: Whether the interface and commands will be available (API-only mode)
+    `API-Only-Mode` **[Boolean]**: Whether the interface and commands will be available (toggles API-only mode)
    `Show-Addresses` **[Boolean]**: Toggle server addresses' visibility in the interface
    `Use-Title-Messages` **[Boolean]**: Toggle the use of title messages in the interface
    `SubData` **[Object]**: Settings to connect to SubData with
        `Name` **[Enum Value]** (Optional): The name of the Server as defined in the global or bungee configuration. When this value is not present the server will try to guess which server this connection belongs to using it's address and port number. If this fails, this value becomes required.
        `Address` **[Socket Address]**: The address to connect to the SubData Server with
-        `Password` **[String]**: The password to login with
-        `Encryption` **[Enum Value]**: Set which cipher to use for encrypting SubData traffic (Must match the one the server uses)
\ No newline at end of file +        `Password` **[String]** (Optional): The password to login with
\ No newline at end of file