diff --git a/.dockerignore b/.dockerignore index 37cecd84..7da6456c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,4 +6,5 @@ versions.txt build.sh docker-compose.yml .env -docker/__pycache__ \ No newline at end of file +docker/__pycache__ +.env.example \ No newline at end of file diff --git a/.env.example b/.env.example index 7251fcd1..5deedba1 100644 --- a/.env.example +++ b/.env.example @@ -5,6 +5,4 @@ BUILD_THREADS=1 # Updates NET_VERSION in CMakeVariables.txt BUILD_VERSION=171022 # make sure this is a long random string -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 \ No newline at end of file +ACCOUNT_MANAGER_SECRET= \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index ee13a33d..68fa6302 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,6 @@ services: - DATABASE_HOST=database - DATABASE_USER=${MARIADB_USER:-darkflame} - DATABASE_PASSWORD=${MARIADB_PASSWORD:-darkflame} - - EXTERNAL_IP=${EXTERNAL_IP:-localhost} volumes: - ${CLIENT_PATH:?err}:/client depends_on: diff --git a/docker/start_server.sh b/docker/start_server.sh index fc14a052..975646b0 100644 --- a/docker/start_server.sh +++ b/docker/start_server.sh @@ -46,7 +46,7 @@ function update_database_ini_values_for() { update_ini $INI_FILE mysql_username $DATABASE_USER update_ini $INI_FILE mysql_password $DATABASE_PASSWORD if [[ "$INI_FILE" != "worldconfig.ini" ]]; then - update_ini $INI_FILE external_ip $EXTERNAL_IP + update_ini $INI_FILE external_ip "darkflame" fi }