From c60cfa35704492dafb7ac2365e3eeaffc979a59b Mon Sep 17 00:00:00 2001 From: Thijs van Loef Date: Thu, 4 Apr 2024 18:52:22 +0200 Subject: [PATCH 1/5] Update config to include latest changes --- README.md | 5 +++++ .../docs/getting-started/configuration/server-settings.md | 5 ++++- docusaurus/docs/guides/pinning-game-version.md | 1 + scripts/compile-settings.sh | 8 ++++++++ scripts/files/PalWorldSettings.ini.template | 6 +++++- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 50d6d2da0..1cd6d086b 100644 --- a/README.md +++ b/README.md @@ -219,9 +219,13 @@ It is highly recommended you set the following environment values before startin | UPDATE_ON_BOOT** | Update/Install the server when the docker container starts (THIS HAS TO BE ENABLED THE FIRST TIME YOU RUN THE CONTAINER) | true | true/false | | RCON_ENABLED*** | Enable RCON for the Palworld server | true | true/false | | RCON_PORT | RCON port to connect to | 25575 | 1024-65535 | +| REST_API_ENABLED | Enable REST API for the palworld server | false | 1024-65535 | +| REST_API_PORT | REST API port to connect to | 8212 | 1024-65535 | | QUERY_PORT | Query port used to communicate with Steam servers | 27015 | 1024-65535 | +| ALLOW_CONNECT_PLATFORM | !!Doesn't work this version!! | Steam | unknown | | BACKUP_CRON_EXPRESSION | Setting affects frequency of automatic backups. | 0 0 \* \* \* | Needs a Cron-Expression - See [Configuring Automatic Backups with Cron](#configuring-automatic-backups-with-cron) | | BACKUP_ENABLED | Enables automatic backups | true | true/false | +| USE_BACKUP_SAVE_DATA | Enables native automatic backups | true | true/false | | DELETE_OLD_BACKUPS | Delete backups after a certain number of days | false | true/false | | OLD_BACKUP_DAYS | How many days to keep backups | 30 | any positive integer | | AUTO_UPDATE_CRON_EXPRESSION | Setting affects frequency of automatic updates. | 0 \* \* \* \* | Needs a Cron-Expression - See [Configuring Automatic Backups with Cron](#configuring-automatic-backups-with-cron) | @@ -577,6 +581,7 @@ The manifest corresponds to the release date/update versions. Manifests can be f | 1.4.1 | 6370735655629434989 | | 1.5.0 | 3750364703337203431 | | 1.5.1 | 2815085007637542021 | +| 2.0.6 | 1677469329840659324 | ## Reporting Issues/Feature Requests diff --git a/docusaurus/docs/getting-started/configuration/server-settings.md b/docusaurus/docs/getting-started/configuration/server-settings.md index 4bef3b111..59494a256 100644 --- a/docusaurus/docs/getting-started/configuration/server-settings.md +++ b/docusaurus/docs/getting-started/configuration/server-settings.md @@ -39,7 +39,10 @@ It is highly recommended you set the following environment values before startin | UPDATE_ON_BOOT** | Update/Install the server when the docker container starts (THIS HAS TO BE ENABLED THE FIRST TIME YOU RUN THE CONTAINER) | true | true/false | | RCON_ENABLED*** | Enable RCON for the Palworld server | true | true/false | | RCON_PORT | RCON port to connect to | 25575 | 1024-65535 | -| QUERY_PORT | Query port used to communicate with Steam servers | 27015 | 1024-65535 | +| REST_API_ENABLED | Enable REST API for the palworld server | false | 1024-65535 | +| REST_API_PORT | REST API port to connect to | 8212 | 1024-65535 | +| QUERY_PORT | Query port used to communicate with Steam servers | 27015 | 1024-65535 | +| ALLOW_CONNECT_PLATFORM | !!Doesn't work this version!! | Steam | unknown | | BACKUP_CRON_EXPRESSION | Setting affects frequency of automatic backups. | 0 0 \* \* \* | Needs a Cron-Expression - See [Configuring Automatic Backups with Cron](https://palworld-server-docker.loef.dev/guides/backup/automated-backup) | | BACKUP_ENABLED | Enables automatic backups | true | true/false | | DELETE_OLD_BACKUPS | Delete backups after a certain number of days | false | true/false | diff --git a/docusaurus/docs/guides/pinning-game-version.md b/docusaurus/docs/guides/pinning-game-version.md index abdafc3e9..53c1c20f3 100644 --- a/docusaurus/docs/guides/pinning-game-version.md +++ b/docusaurus/docs/guides/pinning-game-version.md @@ -22,3 +22,4 @@ The manifest corresponds to the release date/update versions. Manifests can be f | 1.4.1 | 6370735655629434989 | | 1.5.0 | 3750364703337203431 | | 1.5.1 | 2815085007637542021 | +| 2.0.6 | 1677469329840659324 | diff --git a/scripts/compile-settings.sh b/scripts/compile-settings.sh index 7c4c876cb..255051712 100755 --- a/scripts/compile-settings.sh +++ b/scripts/compile-settings.sh @@ -83,7 +83,11 @@ export RCON_PORT=${RCON_PORT:-25575} export REGION=\"${REGION:-""}\" export USEAUTH=${USEAUTH:-True} export BAN_LIST_URL=\"${BAN_LIST_URL:-https://api.palworldgame.com/api/banlist.txt}\" +export REST_API_ENABLED=\"${REST_API_ENABLED:-False}\" +export REST_API_PORT=\"${REST_API_PORT:-8212}\" export SHOW_PLAYER_LIST=${SHOW_PLAYER_LIST:-True} +export ALLOW_CONNECT_PLATFORM=${ALLOW_CONNECT_PLATFORM:-"Steam"} +export USE_BACKUP_SAVE_DATA=${USE_BACKUP_SAVE_DATA:-True} if [ "${DEBUG,,}" = true ]; then cat < Date: Thu, 4 Apr 2024 19:21:43 +0200 Subject: [PATCH 2/5] fix spacing --- scripts/compile-settings.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/compile-settings.sh b/scripts/compile-settings.sh index 255051712..22fae7419 100755 --- a/scripts/compile-settings.sh +++ b/scripts/compile-settings.sh @@ -154,11 +154,11 @@ RCON_PORT = $RCON_PORT REGION = $REGION USEAUTH = $USEAUTH BAN_LIST_URL = $BAN_LIST_URL -REST_API_ENABLED= $REST_API_ENABLED -REST_API_PORT= $REST_API_PORT +REST_API_ENABLED = $REST_API_ENABLED +REST_API_PORT = $REST_API_PORT SHOW_PLAYER_LIST = $SHOW_PLAYER_LIST -ALLOW_CONNECT_PLATFORM= $ALLOW_CONNECT_PLATFORM -USE_BACKUP_SAVE_DATA= $USE_BACKUP_SAVE_DATA +ALLOW_CONNECT_PLATFORM = $ALLOW_CONNECT_PLATFORM +USE_BACKUP_SAVE_DATA = $USE_BACKUP_SAVE_DATA ====Debug==== EOF fi From 2687d4deb76898c6fbdfa70e5c2c71f928a05a28 Mon Sep 17 00:00:00 2001 From: Thijs van Loef Date: Thu, 4 Apr 2024 19:23:47 +0200 Subject: [PATCH 3/5] fix copy paste error --- README.md | 2 +- .../docs/getting-started/configuration/server-settings.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1cd6d086b..b5776f00c 100644 --- a/README.md +++ b/README.md @@ -219,7 +219,7 @@ It is highly recommended you set the following environment values before startin | UPDATE_ON_BOOT** | Update/Install the server when the docker container starts (THIS HAS TO BE ENABLED THE FIRST TIME YOU RUN THE CONTAINER) | true | true/false | | RCON_ENABLED*** | Enable RCON for the Palworld server | true | true/false | | RCON_PORT | RCON port to connect to | 25575 | 1024-65535 | -| REST_API_ENABLED | Enable REST API for the palworld server | false | 1024-65535 | +| REST_API_ENABLED | Enable REST API for the palworld server | false | true/false | | REST_API_PORT | REST API port to connect to | 8212 | 1024-65535 | | QUERY_PORT | Query port used to communicate with Steam servers | 27015 | 1024-65535 | | ALLOW_CONNECT_PLATFORM | !!Doesn't work this version!! | Steam | unknown | diff --git a/docusaurus/docs/getting-started/configuration/server-settings.md b/docusaurus/docs/getting-started/configuration/server-settings.md index 59494a256..7c2b38f69 100644 --- a/docusaurus/docs/getting-started/configuration/server-settings.md +++ b/docusaurus/docs/getting-started/configuration/server-settings.md @@ -39,7 +39,7 @@ It is highly recommended you set the following environment values before startin | UPDATE_ON_BOOT** | Update/Install the server when the docker container starts (THIS HAS TO BE ENABLED THE FIRST TIME YOU RUN THE CONTAINER) | true | true/false | | RCON_ENABLED*** | Enable RCON for the Palworld server | true | true/false | | RCON_PORT | RCON port to connect to | 25575 | 1024-65535 | -| REST_API_ENABLED | Enable REST API for the palworld server | false | 1024-65535 | +| REST_API_ENABLED | Enable REST API for the palworld server | false | true/false | | REST_API_PORT | REST API port to connect to | 8212 | 1024-65535 | | QUERY_PORT | Query port used to communicate with Steam servers | 27015 | 1024-65535 | | ALLOW_CONNECT_PLATFORM | !!Doesn't work this version!! | Steam | unknown | From d4c9df01dde5583e7842c74e9a247f7564a4bb0d Mon Sep 17 00:00:00 2001 From: Thijs van Loef Date: Thu, 4 Apr 2024 19:53:36 +0200 Subject: [PATCH 4/5] fix arm build --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index 4025bb769..6785f3f81 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -64,7 +64,7 @@ if [ "$architecture" == "arm64" ]; then ;; esac - sed -i "s|\(\"\$UE_PROJECT_ROOT\/Pal\/Binaries\/Linux\/PalServer-Linux-Test\" Pal \"\$@\"\)|LD_LIBRARY_PATH=/home/steam/steamcmd/linux64:\$LD_LIBRARY_PATH $box64_binary \1|" ./PalServer-arm64.sh + sed -i "s|\(\"\$UE_PROJECT_ROOT\/Pal\/Binaries\/Linux\/PalServer-Linux-Shipping\" Pal \"\$@\"\)|LD_LIBRARY_PATH=/home/steam/steamcmd/linux64:\$LD_LIBRARY_PATH $box64_binary \1|" ./PalServer-arm64.sh chmod +x ./PalServer-arm64.sh STARTCOMMAND=("./PalServer-arm64.sh") else From 7693ff7207672dbe06f3922beaabdcaf66539bf4 Mon Sep 17 00:00:00 2001 From: Thijs van Loef Date: Thu, 4 Apr 2024 20:06:15 +0200 Subject: [PATCH 5/5] change pidofs --- scripts/init.sh | 2 +- scripts/player_logging.sh | 2 +- scripts/restore.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/init.sh b/scripts/init.sh index 286c1a0f9..d1f3634e3 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -30,7 +30,7 @@ term_handler() { if ! shutdown_server; then # Does not save - kill -SIGTERM "$(pidof PalServer-Linux-Test)" + kill -SIGTERM "$(pidof PalServer-Linux-Shipping)" fi tail --pid="$killpid" -f 2>/dev/null diff --git a/scripts/player_logging.sh b/scripts/player_logging.sh index 37017b891..5ae80b934 100644 --- a/scripts/player_logging.sh +++ b/scripts/player_logging.sh @@ -19,7 +19,7 @@ while ! nc -z 127.0.0.1 "${RCON_PORT}"; do done while true; do - server_pid=$(pidof PalServer-Linux-Test) + server_pid=$(pidof PalServer-Linux-Shipping) if [ -n "${server_pid}" ]; then # Player IDs are usally 9 or 10 digits however when a player joins for the first time for a given boot their ID is temporary 00000000 (8x zeros) while loading # Player ID is also 00000000 (8x zeros) when in character creation diff --git a/scripts/restore.sh b/scripts/restore.sh index 87fd3be32..186b0b1ce 100644 --- a/scripts/restore.sh +++ b/scripts/restore.sh @@ -69,7 +69,7 @@ if [ -f "$BACKUP_FILE" ]; then exit 1 fi - server_pid=$(pidof PalServer-Linux-Test) + server_pid=$(pidof PalServer-Linux-Shipping) if [ -n "${server_pid}" ]; then LogInfo "Waiting for Palworld to exit.." tail --pid="${server_pid}" -f /dev/null