diff options
| -rw-r--r-- | apps/compiler/includes/functions.sh | 19 | ||||
| -rw-r--r-- | env/docker/etc/dbimport.conf.dockerdist | 1 | ||||
| -rw-r--r-- | env/docker/etc/worldserver.conf.dockerdist | 1 |
3 files changed, 11 insertions, 10 deletions
diff --git a/apps/compiler/includes/functions.sh b/apps/compiler/includes/functions.sh index 044425a7e5..842f65b85b 100644 --- a/apps/compiler/includes/functions.sh +++ b/apps/compiler/includes/functions.sh @@ -136,16 +136,19 @@ function comp_compile() { cd $CWD - if [[ $DOCKER = 1 ]]; then - echo "Generating confs..." - cp -n "env/dist/etc/worldserver.conf.dockerdist" "${confDir}/worldserver.conf" - cp -n "env/dist/etc/authserver.conf.dockerdist" "${confDir}/authserver.conf" - cp -n "env/dist/etc/dbimport.conf.dockerdist" "${confDir}/dbimport.conf" - fi # set all aplications SUID bit echo "Setting permissions on binary files" - find "$AC_BINPATH_FULL" -type f -exec sudo chown root:root -- {} + - find "$AC_BINPATH_FULL" -type f -exec sudo chmod u+s -- {} + + find "$AC_BINPATH_FULL" -mindepth 1 -maxdepth 1 -type f -exec sudo chown root:root -- {} + + find "$AC_BINPATH_FULL" -mindepth 1 -maxdepth 1 -type f -exec sudo chmod u+s -- {} + + + DOCKER_ETC_FOLDER=${DOCKER_ETC_FOLDER:-"env/dist/etc"} + + if [[ $DOCKER = 1 && $DISABLE_DOCKER_CONF != 1 ]]; then + echo "Generating confs..." + cp -n "$DOCKER_ETC_FOLDER/worldserver.conf.dockerdist" "${confDir}/worldserver.conf" + cp -n "$DOCKER_ETC_FOLDER/authserver.conf.dockerdist" "${confDir}/authserver.conf" + cp -n "$DOCKER_ETC_FOLDER/dbimport.conf.dockerdist" "${confDir}/dbimport.conf" + fi echo "Done" ;; diff --git a/env/docker/etc/dbimport.conf.dockerdist b/env/docker/etc/dbimport.conf.dockerdist index 2de64cedd5..183cf873e7 100644 --- a/env/docker/etc/dbimport.conf.dockerdist +++ b/env/docker/etc/dbimport.conf.dockerdist @@ -2,7 +2,6 @@ # Files in LogsDir will reflect on your host directory: docker/worldserver/logs LogsDir = "/azerothcore/env/dist/logs" # Files in TempDir will reflect on your host directory: docker/authserver/temp -TempDir = "/azerothcore/env/dist/temp" DataDir = "/azerothcore/env/dist/data" # Change this configuration accordingly with your docker setup diff --git a/env/docker/etc/worldserver.conf.dockerdist b/env/docker/etc/worldserver.conf.dockerdist index 8c391c94d1..c5dc18fe50 100644 --- a/env/docker/etc/worldserver.conf.dockerdist +++ b/env/docker/etc/worldserver.conf.dockerdist @@ -7,7 +7,6 @@ # Files in LogsDir will reflect on your host directory: docker/worldserver/logs LogsDir = "/azerothcore/env/dist/logs" # Files in TempDir will reflect on your host directory: docker/authserver/temp -TempDir = "/azerothcore/env/dist/temp" DataDir = "/azerothcore/env/dist/data" # Change this configuration accordingly with your docker setup |