Skip to content

By default, use RCON password from rcon-cli.env #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2023
Merged

By default, use RCON password from rcon-cli.env #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions backup-loop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,28 @@ fi
: "${SERVER_PORT:=25565}"
: "${RCON_HOST:=localhost}"
: "${RCON_PORT:=25575}"
: "${RCON_PASSWORD_FILE:=}"
: "${RCON_PASSWORD:=minecraft}"

if ! [[ -v RCON_PASSWORD ]] && ! [[ -v RCON_PASSWORD_FILE ]] && [[ -f "${SRC_DIR}/.rcon-cli.env" ]]; then
. "${SRC_DIR}/.rcon-cli.env"
# shellcheck disable=SC2154
# since it comes from rcon-cli
RCON_PASSWORD="$password"
elif [[ -v RCON_PASSWORD_FILE ]]; then
if [ ! -e "${RCON_PASSWORD_FILE}" ]; then
log ERROR "Initial RCON password file ${RCON_PASSWORD_FILE} does not seems to exist."
log ERROR "Please ensure your configuration."
log ERROR "If you are using Docker Secrets feature, please check this for further information: "
log ERROR " https://docs.docker.com/engine/swarm/secrets"
exit 1
else
RCON_PASSWORD=$(cat "${RCON_PASSWORD_FILE}")
fi
elif ! [[ -v RCON_PASSWORD ]]; then
# Legacy default
RCON_PASSWORD=minecraft
fi
export RCON_PASSWORD

: "${RCON_RETRIES:=5}"
: "${RCON_RETRY_INTERVAL:=10s}"
: "${EXCLUDES:=*.jar,cache,logs}" # Comma separated list of glob(3) patterns
Expand All @@ -49,7 +69,6 @@ export TZ

export RCON_HOST
export RCON_PORT
export RCON_PASSWORD
export XDG_CONFIG_HOME
export SRC_DIR
export DEST_DIR
Expand Down Expand Up @@ -383,25 +402,6 @@ rclone() {
## main ##
##########

if [[ $RCON_PASSWORD_FILE ]]; then
if [ ! -e ${RCON_PASSWORD_FILE} ]; then
log ERROR "Initial RCON password file ${RCON_PASSWORD_FILE} does not seems to exist."
log ERROR "Please ensure your configuration."
log ERROR "If you are using Docker Secrets feature, please check this for further information: "
log ERROR " https://docs.docker.com/engine/swarm/secrets"
exit 1
else
RCON_PASSWORD=$(cat ${RCON_PASSWORD_FILE})
export RCON_PASSWORD
fi
fi

if [[ $PRE_SAVE_ALL_SCRIPT ]]; then
PRE_SAVE_ALL_SCRIPT_FILE=/tmp/pre-save-all
printf '#!/bin/bash\n\n%s' "$PRE_SAVE_ALL_SCRIPT" > "$PRE_SAVE_ALL_SCRIPT_FILE"
chmod 700 "$PRE_SAVE_ALL_SCRIPT_FILE"
fi

if [[ $PRE_BACKUP_SCRIPT ]]; then
PRE_BACKUP_SCRIPT_FILE=/tmp/pre-backup
printf '#!/bin/bash\n\n%s' "$PRE_BACKUP_SCRIPT" > "$PRE_BACKUP_SCRIPT_FILE"
Expand Down