From 33c2154a984984d1ea2e344f9bcf82c8d623ef12 Mon Sep 17 00:00:00 2001 From: itzg Date: Thu, 24 Jun 2021 12:47:02 +0000 Subject: [PATCH 1/2] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9db5723..c0aa8b39 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Enabling Autopause](#enabling-autopause) * [Running on RaspberryPi](#running-on-raspberrypi) - + From 9d231801daa1f04a1aa6e4cf4e743cc46c1b6891 Mon Sep 17 00:00:00 2001 From: Pascal Sthamer Date: Sun, 27 Jun 2021 15:12:51 +0200 Subject: [PATCH 2/2] Allow to enable the whitelist without modifying the whitelist file (#937) --- README.md | 4 +++- start-finalSetupServerProperties | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c0aa8b39..31644d7c 100644 --- a/README.md +++ b/README.md @@ -790,10 +790,11 @@ To whitelist players for your Minecraft server, pass the Minecraft usernames sep If the `WHITELIST` environment variable is not used, any user can join your Minecraft server if it's publicly accessible. -> NOTE: When `WHITELIST` is used the server property `white-list` will automatically get set to `true`. +> NOTE: When `WHITELIST` is used the server properties `white-list` and `whitelist` will automatically get set to `true`. > By default, the players in `WHITELIST` are **added** to the final `whitelist.json` file by the Minecraft server. If you set `OVERRIDE_WHITELIST` to "true" then the `whitelist.json` file will be recreated on each server startup. +Alternatively, you can set `ENABLE_WHITELIST=true` to only set the server properties `white-list` and `whitelist` without modifying the whitelist file. In this case the whitelist is solely managed using the `whitelist add` and `whitelist remove` commands. ### Op/Administrator Players To add more "op" (aka adminstrator) users to your Minecraft server, pass the Minecraft usernames separated by commas via the `OPS` environment variable, such as @@ -1048,6 +1049,7 @@ Allows users to use flight on your server while in Survival mode, if they have a | PREVENT_PROXY_CONNECTIONS | prevent-proxy-connections | | USE_NATIVE_TRANSPORT | use-native-transport | | ENFORCE_WHITELIST | enforce-whitelist | +| ENABLE_WHITELIST | white-list and whitelist | ## Miscellaneous Options diff --git a/start-finalSetupServerProperties b/start-finalSetupServerProperties index 382ff5bd..1f8fe822 100644 --- a/start-finalSetupServerProperties +++ b/start-finalSetupServerProperties @@ -27,7 +27,7 @@ function setServerProp { } function customizeServerProps { - if [ -n "$WHITELIST" ]; then + if [ -n "$WHITELIST" ] || isTrue ${ENABLE_WHITELIST:-false}; then log "Creating whitelist" setServerProp "whitelist" "true" setServerProp "white-list" "true"