Mirrors/docker-minecraft-server
2
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server synced 2024-09-19 21:51:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Default EXISTING_OPS_FILE and EXISTING_WHITELIST_FILE to SYNC_FILE_MERGE_LIST (#3042)

Browse source
This commit is contained in:
Geoff Bourne 2024-08-12 17:57:18 -05:00 committed by GitHub
parent 6d9c6d64e2
commit cea839aa67
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/configuration/server-properties.md
View file

@ -134,10 +134,10 @@ To change the behavior when the whitelist file already exists, set the variable
`SYNCHRONIZE`
: Synchronize the list of users in the file with the `WHITELIST` or `WHITELIST_FILE` provided. When using both, `WHITELIST` will take precedence. This is the same as setting the legacy variable `OVERRIDE_WHITELIST` to "true".
`MERGE` (default)
`MERGE`
: Merge the list of users from `WHITELIST` into the existing file. `WHITELIST_FILE` cannot be used with this option.
`SYNC_FILE_MERGE_LIST`
`SYNC_FILE_MERGE_LIST` (default)
: When `WHITELIST_FILE` is provided it will overwrite an existing whitelist file. Also, if `WHITELIST` is provided, then those users will be merged into the newly copied file.
!!! note
@ -177,10 +177,10 @@ To change the behavior when the ops file already exists, set the variable `EXIST
`SYNCHRONIZE`
: Synchronize the list of users in the file with the `OPS` or `OPS_FILE` provided. When using both, `OPS` will take precedence. The `level` and `bypassesPlayerLimit` will be retained from previous entries. This is the same as setting the legacy variable `OVERRIDE_OPS` to "true".
`MERGE` (default)
`MERGE`
: Merge the list of users from `OPS` into the existing file. `OPS_FILE` cannot be used with this option.
`SYNC_FILE_MERGE_LIST`
`SYNC_FILE_MERGE_LIST` (default)
: When `OPS_FILE` is provided it will overwrite an existing ops file. Also, if `OPS` is provided, then those users will be merged into the newly copied file.
!!! note

4
scripts/start-setupRbac
View file

@ -2,8 +2,8 @@
set -euo pipefail
IFS=$'\n\t'
: "${EXISTING_OPS_FILE:=MERGE}"
: "${EXISTING_WHITELIST_FILE:=MERGE}"
: "${EXISTING_OPS_FILE:=SYNC_FILE_MERGE_LIST}"
: "${EXISTING_WHITELIST_FILE:=SYNC_FILE_MERGE_LIST}"
# shellcheck source=start-utils
. "${SCRIPTS:-/}start-utils"