WIP: connection issue

This commit is contained in:
Nils Bergmann 2021-12-08 02:40:27 +01:00
parent cf6f69ba93
commit 0dfc962df5
No known key found for this signature in database
GPG Key ID: 5FAEC08EE1DC2DF9
4 changed files with 4 additions and 6 deletions

View File

@ -6,4 +6,5 @@ versions.txt
build.sh build.sh
docker-compose.yml docker-compose.yml
.env .env
docker/__pycache__ docker/__pycache__
.env.example

View File

@ -5,6 +5,4 @@ BUILD_THREADS=1
# Updates NET_VERSION in CMakeVariables.txt # Updates NET_VERSION in CMakeVariables.txt
BUILD_VERSION=171022 BUILD_VERSION=171022
# make sure this is a long random string # make sure this is a long random string
ACCOUNT_MANAGER_SECRET= ACCOUNT_MANAGER_SECRET=
# Needs to be set to the actual public ip. See https://github.com/DarkflameUniverse/DarkflameServer/issues/45
EXTERNAL_IP=0.0.0.0

View File

@ -30,7 +30,6 @@ services:
- DATABASE_HOST=database - DATABASE_HOST=database
- DATABASE_USER=${MARIADB_USER:-darkflame} - DATABASE_USER=${MARIADB_USER:-darkflame}
- DATABASE_PASSWORD=${MARIADB_PASSWORD:-darkflame} - DATABASE_PASSWORD=${MARIADB_PASSWORD:-darkflame}
- EXTERNAL_IP=${EXTERNAL_IP:-localhost}
volumes: volumes:
- ${CLIENT_PATH:?err}:/client - ${CLIENT_PATH:?err}:/client
depends_on: depends_on:

View File

@ -46,7 +46,7 @@ function update_database_ini_values_for() {
update_ini $INI_FILE mysql_username $DATABASE_USER update_ini $INI_FILE mysql_username $DATABASE_USER
update_ini $INI_FILE mysql_password $DATABASE_PASSWORD update_ini $INI_FILE mysql_password $DATABASE_PASSWORD
if [[ "$INI_FILE" != "worldconfig.ini" ]]; then if [[ "$INI_FILE" != "worldconfig.ini" ]]; then
update_ini $INI_FILE external_ip $EXTERNAL_IP update_ini $INI_FILE external_ip "darkflame"
fi fi
} }