Few fixes and tweaks

Author: Dids

Dockerfile

@@ -73,7 +73,10 @@ ENV V_RISING_SERVER_UPDATE_MODE              "0"
 # Setup environment variables for customizing the server
 ENV V_RISING_SERVER_NAME                     "V Rising Docker Server"
 ENV V_RISING_SERVER_DESCRIPTION              "V Rising server running inside a Docker container."
-ENV V_RISING_SERVER_BIND_IP                  "127.0.0.1"
+# ENV V_RISING_SERVER_BIND_IP                  "127.0.0.1"
+ENV V_RISING_SERVER_BIND_IP                  "0.0.0.0"
+# ENV V_RISING_SERVER_BIND_IP                  ""
+ENV V_RISING_SERVER_BIND_IP_AUTO_DETECT      true
 ENV V_RISING_SERVER_GAME_PORT                9876
 ENV V_RISING_SERVER_QUERY_PORT               9877
 ENV V_RISING_SERVER_RCON_PORT                9878
@@ -83,7 +86,9 @@ ENV V_RISING_SERVER_MAX_CONNECTED_USERS      40
 ENV V_RISING_SERVER_MAX_CONNECTED_ADMINS     4
 ENV V_RISING_SERVER_SAVE_NAME                "docker"
 ENV V_RISING_SERVER_PASSWORD                 ""
-ENV V_RISING_SERVER_LIST_ON_MNASTER_SERVER   true
+ENV V_RISING_SERVER_LIST_ON_MASTER_SERVER    true
+ENV V_RISING_SERVER_LIST_ON_STEAM            true
+ENV V_RISING_SERVER_LIST_ON_EOS              true
 ENV V_RISING_SERVER_AUTO_SAVE_COUNT          50
 ENV V_RISING_SERVER_AUTO_SAVE_INTERVAL       600
 ENV V_RISING_SERVER_GAME_SETTINGS_PRESET     "StandardPvE"

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2022 Didstopia
+Copyright (c) 2022-2023 Didstopia
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

docker-compose.yml

@@ -30,7 +30,9 @@ services:
       V_RISING_SERVER_MAX_CONNECTED_ADMINS: 1
       V_RISING_SERVER_SAVE_NAME: "test_server"
       V_RISING_SERVER_PASSWORD: "t35t"
-      V_RISING_SERVER_LIST_ON_MNASTER_SERVER: false
+      V_RISING_SERVER_LIST_ON_MASTER_SERVER: false
+      V_RISING_SERVER_LIST_ON_STEAM: false
+      V_RISING_SERVER_LIST_ON_EOS: false
       V_RISING_SERVER_AUTO_SAVE_COUNT: 5
       V_RISING_SERVER_AUTO_SAVE_INTERVAL: 10
       V_RISING_SERVER_GAME_SETTINGS_PRESET: "StandardPvE"

install.txt

@@ -1,6 +1,6 @@
 @sSteamCmdForcePlatformType linux
-force_install_dir /steamcmd/vrising
 login anonymous
+force_install_dir /steamcmd/vrising
 app_info_update 1
 app_update 1829350 validate
 quit

start_vrising.sh

@@ -146,9 +146,10 @@ V_RISING_SERVER_ADMIN_LIST_FILE="${V_RISING_SERVER_PERSISTENT_DATA_PATH}/adminli
 if [ ! -f "${V_RISING_SERVER_ADMIN_LIST_FILE}" ]; then
 	echo "Admin list file not found, creating a new one.."
 	cp ${V_RISING_SERVER_ADMIN_LIST_FILE_DEFAULT} ${V_RISING_SERVER_ADMIN_LIST_FILE}
-else
-  echo "Applying custom admin list file.."
-  cp -f ${V_RISING_SERVER_ADMIN_LIST_FILE} ${V_RISING_SERVER_ADMIN_LIST_FILE_DEFAULT}
+# else
+#   ## TODO: Why would we copy over the defaults if we have the persistence path set?
+#   echo "Applying custom admin list file.."
+#   cp -f ${V_RISING_SERVER_ADMIN_LIST_FILE} ${V_RISING_SERVER_ADMIN_LIST_FILE_DEFAULT}
 fi
 
 # Copy ban list file if one doesn't yet exist
@@ -157,9 +158,10 @@ V_RISING_SERVER_BAN_LIST_FILE="${V_RISING_SERVER_PERSISTENT_DATA_PATH}/banlist.t
 if [ ! -f "${V_RISING_SERVER_BAN_LIST_FILE}" ]; then
 	echo "Ban list file not found, creating a new one.."
 	cp ${V_RISING_SERVER_BAN_LIST_FILE_DEFAULT} ${V_RISING_SERVER_BAN_LIST_FILE}
-else
-  echo "Applying custom ban list file.."
-  cp -f ${V_RISING_SERVER_BAN_LIST_FILE} ${V_RISING_SERVER_BAN_LIST_FILE_DEFAULT}
+# else
+#   ## TODO: Why would we copy over the defaults if we have the persistence path set?
+#   echo "Applying custom ban list file.."
+#   cp -f ${V_RISING_SERVER_BAN_LIST_FILE} ${V_RISING_SERVER_BAN_LIST_FILE_DEFAULT}
 fi
 
 ## TODO: This is a bit dumb at the moment, as it's always replacing the file,
@@ -168,28 +170,45 @@ fi
 cat "${V_RISING_SERVER_CONFIG_FILE}" | jq '.Rcon = { "Enabled": env.V_RISING_SERVER_RCON_ENABLED|test("true"), "Password": env.V_RISING_SERVER_RCON_PASSWORD, "Port": env.V_RISING_SERVER_RCON_PORT|tonumber }' > "/tmp/ServerHostSettings.json.tmp"
 cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 
+# If V_RISING_SERVER_BIND_IP_AUTO_DETECT is set to true, try to detect the public IP address,
+# overriding the V_RISING_SERVER_BIND_IP setting if we get a valid IP address back
+if [ "$V_RISING_SERVER_BIND_IP_AUTO_DETECT" = "true" ]; then
+  echo "Auto-detecting public IP address.."
+  V_RISING_SERVER_BIND_IP="$(curl -s https://api.ipify.org)"
+  if [ $? -ne 0 ]; then
+    echo "Failed to auto-detect public IP address, exiting.."
+    exit 1
+  fi
+  echo "Public IP address detected as: $V_RISING_SERVER_BIND_IP"
+fi
+
 ## FIXME: We should likely ONLY apply these when we first copy the the defaults,
 ##        so that users are given the option of manually being able to persist edits to the files?
 ## TODO: This should be refactored to use functions, to cut down on boilerplate etc.
 # Apply the server settings
 jq '.Name |= env.V_RISING_SERVER_NAME' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 jq '.Description |= env.V_RISING_SERVER_DESCRIPTION' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
+jq '.Address |= env.V_RISING_SERVER_BIND_IP' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 jq '.Port |= env.V_RISING_SERVER_GAME_PORT|tonumber' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 jq '.QueryPort |= env.V_RISING_SERVER_QUERY_PORT|tonumber' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 jq '.MaxConnectedUsers |= env.V_RISING_SERVER_MAX_CONNECTED_USERS|tonumber' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 jq '.MaxConnectedAdmins |= env.V_RISING_SERVER_MAX_CONNECTED_ADMINS|tonumber' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 jq '.SaveName |= env.V_RISING_SERVER_SAVE_NAME' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 jq '.Password |= env.V_RISING_SERVER_PASSWORD' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
-jq '.ListOnMasterServer |= env.V_RISING_SERVER_LIST_ON_MNASTER_SERVER|test("true")' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
+jq '.ListOnMasterServer |= env.V_RISING_SERVER_LIST_ON_MASTER_SERVER|test("true")' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
+jq '.ListOnSteam |= env.V_RISING_SERVER_LIST_ON_STEAM|test("true")' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
+jq '.ListOnEOS |= env.V_RISING_SERVER_LIST_ON_EOS|test("true")' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 jq '.AutoSaveCount |= env.V_RISING_SERVER_AUTO_SAVE_COUNT|tonumber' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 jq '.AutoSaveInterval |= env.V_RISING_SERVER_AUTO_SAVE_INTERVAL|tonumber' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 jq '.GameSettingsPreset |= env.V_RISING_SERVER_GAME_SETTINGS_PRESET' "${V_RISING_SERVER_CONFIG_FILE}" > "/tmp/ServerHostSettings.json.tmp" && cp -f "/tmp/ServerHostSettings.json.tmp" "${V_RISING_SERVER_CONFIG_FILE}"
 
-echo "Applying custom server configuration file.."
-cp -f ${V_RISING_SERVER_CONFIG_FILE} ${V_RISING_SERVER_CONFIG_FILE_DEFAULT}
+## TODO: Why would we copy over the defaults if we have the persistence path set?
+# echo "Applying custom server configuration file.."
+# cp -f ${V_RISING_SERVER_CONFIG_FILE} ${V_RISING_SERVER_CONFIG_FILE_DEFAULT}
 
-echo "Applying custom game configuration file.."
-cp -f ${V_RISING_SERVER_GAME_CONFIG_FILE} ${V_RISING_SERVER_GAME_CONFIG_FILE_DEFAULT}
+## TODO: Why would we copy over the defaults if we have the persistence path set?
+# echo "Applying custom game configuration file.."
+# cp -f ${V_RISING_SERVER_GAME_CONFIG_FILE} ${V_RISING_SERVER_GAME_CONFIG_FILE_DEFAULT}
 
 # Start mode 1 means we only want to update
 if [ "$V_RISING_SERVER_START_MODE" = "1" ]; then