diff --git a/6_server-start.sh b/6_server-start.sh index 37c8440..c0aeb52 100755 --- a/6_server-start.sh +++ b/6_server-start.sh @@ -14,7 +14,7 @@ echo " " ########################################################################################## # Apply ah-bot custom configuration ########################################################################################## -source ${ROOT_DIR}/helper/update_ahbot_config.sh ${AH_BOT_MIN_ITEMS} ${AH_BOT_MAX_ITEMS} +source ${ROOT_DIR}/helper/update_ahbot_config.sh ${MOD_AHBOT_MIN_ITEMS} ${MOD_AHBOT_MAX_ITEMS} echo " " diff --git a/config/.env b/config/.env new file mode 100644 index 0000000..831ce3f --- /dev/null +++ b/config/.env @@ -0,0 +1,4 @@ +REALM_IP=192.168.178.185 +REALM_NAME="azerothcore.org" +AH_BOT_MIN_ITEMS=25000 +AH_BOT_MAX_ITEMS=30000 diff --git a/config/setup.env b/config/setup.env new file mode 100644 index 0000000..3558540 --- /dev/null +++ b/config/setup.env @@ -0,0 +1,6 @@ + +REALM_IP=192.168.178.185 +REALM_NAME="azerothcore.org" + +MOD_AHBOT_MIN_ITEMS=35000 +MOD_AHBOT_MAX_ITEMS=45000 diff --git a/config/user.env b/config/user.env new file mode 100644 index 0000000..3558540 --- /dev/null +++ b/config/user.env @@ -0,0 +1,6 @@ + +REALM_IP=192.168.178.185 +REALM_NAME="azerothcore.org" + +MOD_AHBOT_MIN_ITEMS=35000 +MOD_AHBOT_MAX_ITEMS=45000 diff --git a/variables.sh b/variables.sh index e128355..485f8b1 100755 --- a/variables.sh +++ b/variables.sh @@ -1,17 +1,14 @@ #!/bin/bash ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)" +########################################################################################## +# DO NOT MODIFY THIS FILE, SEE /config/user.env settings instead!! +########################################################################################## +set -o allexport && source ${ROOT_DIR}/config/user.env && set +o allexport ########################################################################################## -# If you want remote players to connect use the following info e.g. -# router DMZ or poort-forwarding and possibly firewall settings. -########################################################################################## -# 3724 TCP AUTH-SERVER -# 8085 TCP WORLD-SERVER - - -########################################################################################## -# Variables # https://github.com/azerothcore/azerothcore-wotlk/blob/master/conf/dist/env.ac +# Server and project internal variables +# https://github.com/azerothcore/azerothcore-wotlk/blob/master/conf/dist ########################################################################################## AUTHSERVER="${ROOT_DIR}/_server/azerothcore/acore.sh run-authserver" WORLDSERVER="${ROOT_DIR}/_server/azerothcore/acore.sh run-worldserver" @@ -24,13 +21,3 @@ MYSQL_PASSWORD=acore MYSQL_DATABASE=acore_auth DATAPATH=${ROOT_DIR}/_server/azerothcore/env/dist/bin - -# ---------------------------------------------------------------------------------------- -# if you want remore players to connects then this should the external IP/DNS -# which also should be placed in the 3.35a client Realm.wtf -# ---------------------------------------------------------------------------------------- -REALM_IP=192.168.178.185 -REALM_NAME="azerothcore.org" - -AH_BOT_MIN_ITEMS=25000 -AH_BOT_MAX_ITEMS=30000