diff --git a/docker/setup.sh b/docker/setup.sh index 1a95f4de..0f5c0d2e 100755 --- a/docker/setup.sh +++ b/docker/setup.sh @@ -30,6 +30,7 @@ function update_ini_values() { cp resources/authconfig.ini /docker/configs/ cp resources/chatconfig.ini /docker/configs/ cp resources/worldconfig.ini /docker/configs/ + cp resources/sharedconfig.ini /docker/configs/ update_ini worldconfig.ini chat_server_port $CHAT_SERVER_PORT update_ini worldconfig.ini max_clients $MAX_CLIENTS @@ -37,10 +38,7 @@ function update_ini_values() { # always use the internal docker hostname update_ini masterconfig.ini master_ip "darkflame" - update_database_ini_values_for masterconfig.ini - update_database_ini_values_for authconfig.ini - update_database_ini_values_for chatconfig.ini - update_database_ini_values_for worldconfig.ini + update_database_ini_values_for sharedconfig.ini } function fdb_to_sqlite() { diff --git a/docker/start_server.sh b/docker/start_server.sh index feb61361..ca1a49a0 100755 --- a/docker/start_server.sh +++ b/docker/start_server.sh @@ -8,6 +8,8 @@ function symlink_client_files() { ln -s /client/client/res/names/ /app/res/names ln -s /client/client/res/CDServer.sqlite /app/res/CDServer.sqlite ln -s /client/client/locale/locale.xml /app/locale/locale.xml + # need to create this file so the server knows the client is unpacked (see `dCommon/dClient/AssetManager.cpp`) + touch /app/res/cdclient.fdb # need to iterate over entries in maps due to maps already being a directory with navmeshes/ in it ( cd /client/client/res/maps @@ -25,6 +27,7 @@ function symlink_config_files() { ln -s /shared_configs/configs/chatconfig.ini /app/chatconfig.ini ln -s /shared_configs/configs/masterconfig.ini /app/masterconfig.ini ln -s /shared_configs/configs/worldconfig.ini /app/worldconfig.ini + ln -s /shared_configs/configs/sharedconfig.ini /app/sharedconfig.ini } # check to make sure the setup has completed