amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-08-10 01:13:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue when setting ENABLE_RCON=false (#2513)

Browse Source
This commit is contained in:
Geoff Bourne
2023-11-26 08:34:49 -06:00
committed by GitHub
parent 2917af8ca4
commit 33c75bd2da
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/start-configuration
+12 -9
View File
@@ -50,12 +50,8 @@ fi
########################################## ##########################################
# Setup RCON password # Setup RCON password
if isTrue "${ENABLE_RCON:-true}" && ! [[ -v RCON_PASSWORD ]] && ! [[ -v RCON_PASSWORD_FILE ]]; then if isTrue "${ENABLE_RCON:-true}"; then
RCON_PASSWORD=$(openssl rand -hex 12) if [[ -v RCON_PASSWORD_FILE ]]; then
export RCON_PASSWORD
fi
if [[ -v RCON_PASSWORD_FILE ]]; then
if [ ! -e "${RCON_PASSWORD_FILE}" ]; then if [ ! -e "${RCON_PASSWORD_FILE}" ]; then
log "" log ""
log "Initial RCON password file ${RCON_PASSWORD_FILE} does not seems to exist." log "Initial RCON password file ${RCON_PASSWORD_FILE} does not seems to exist."
@@ -68,11 +64,18 @@ if [[ -v RCON_PASSWORD_FILE ]]; then
RCON_PASSWORD=$(cat "${RCON_PASSWORD_FILE}") RCON_PASSWORD=$(cat "${RCON_PASSWORD_FILE}")
export RCON_PASSWORD export RCON_PASSWORD
fi fi
elif ! [[ -v RCON_PASSWORD ]]; then
RCON_PASSWORD=$(openssl rand -hex 12)
export RCON_PASSWORD
fi
# For rcon-cli access running via exec, which by default is running as root
echo "password=${RCON_PASSWORD}" > "$HOME/.rcon-cli.env"
echo "password: \"${RCON_PASSWORD}\"" > "$HOME/.rcon-cli.yaml"
else
rm -f "$HOME/.rcon-cli.env" "$HOME/.rcon-cli.yaml"
fi fi
# For rcon-cli access running via exec, which by default is running as root
echo "password=${RCON_PASSWORD}" > "$HOME/.rcon-cli.env"
echo "password: \"${RCON_PASSWORD}\"" > "$HOME/.rcon-cli.yaml"
########################################## ##########################################
# Auto-pause/stop # Auto-pause/stop