Skip to content

Commit f425e47

Browse files
BylothByloth
committed
wip: Some further implementations...
1 parent 4cbaab6 commit f425e47

File tree

9 files changed

+118
-22
lines changed

9 files changed

+118
-22
lines changed

‎builder/InstallFullDB.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ DEV_UPDATES="NO"
5858

5959
## Define if AHBot SQL updates need to be applied (by default, assume the core is built without AHBot)
6060
## Set the variable to "YES" to import AHBot sql.
61-
AHBOT="NO"
61+
AHBOT="YES"
6262

6363
## Define if the 'src/modules/PlayerBots/sql' directory for processing development SQL files needs to be used
6464
## Set the variable to "YES" to use the playerbots directory
65-
PLAYERBOTS_DB="NO"
65+
PLAYERBOTS_DB="YES"
6666

6767
# Enjoy using the tool

‎builder/run.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ readonly BASE_DIR="$(realpath "$(dirname "${0}")/..")"
77
source "${BASE_DIR}/.env"
88

99
readonly NAME="cmangos-builder"
10-
readonly IMAGE="ghcr.io/byloth/cmangos/${WOW_VERSION}/builder"
11-
readonly VERSION="latest"
10+
# readonly IMAGE="ghcr.io/byloth/cmangos/${WOW_VERSION}/builder"
11+
# readonly VERSION="latest"
12+
readonly IMAGE="byloth/cmangos-${WOW_VERSION}/builder"
13+
readonly VERSION="develop"
1214

1315
readonly DATA_VOLUME="cmangos_mangosd_data"
1416
readonly NETWORK="cmangos_default"

‎docker-compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ services:
1313
- ./database:/etc/mysql/conf.d:ro
1414

1515
mangosd:
16-
image: "ghcr.io/byloth/cmangos/${WOW_VERSION}:latest"
16+
# image: "ghcr.io/byloth/cmangos/${WOW_VERSION}:latest"
17+
image: byloth/cmangos-tbc:develop
1718
depends_on:
1819
- mariadb
1920

@@ -37,7 +38,8 @@ services:
3738
- ./runner/config:/opt/mangos/conf:ro
3839

3940
realmd:
40-
image: "ghcr.io/byloth/cmangos/${WOW_VERSION}:latest"
41+
# image: "ghcr.io/byloth/cmangos/${WOW_VERSION}:latest"
42+
image: byloth/cmangos-tbc:develop
4143
depends_on:
4244
- mariadb
4345

‎runner/config/ahbot.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
####################################################
2+
# CMaNGOS Auction House Bot - Configuration file #
3+
####################################################
4+
5+
AhBot.Enabled = 1
6+
7+
AuctionHouseBot.Seller.Enabled = 0
8+
AuctionHouseBot.Buyer.Enabled = 0

‎runner/config/aiplayerbot.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
###############################################
2+
# CMaNGOS AI Playerbot - Configuration file #
3+
###############################################
4+
5+
AiPlayerbot.Enabled = 1

‎runner/config/anticheat.conf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
############################################
2+
# CMaNGOS AntiCheat - Configuration file #
3+
############################################
4+
5+
Enable = 0
6+
7+
Movement.SpeedHack.Enable = 0
8+
Movement.BadFallReset.Enable = 0
9+
10+
Antispam.Enable = 0
11+
12+
Warden.Enable = 0

‎runner/config/mangosd.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
##################################
2+
# CMaNGOS - Configuration file #
3+
##################################
14

25
###################################################################################################################
36
#

‎runner/entrypoint.sh

Lines changed: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,47 @@ set -e
55

66
# Utils:
77
#
8-
function _replace_conf()
8+
function echoerr()
9+
{
10+
echo ${@} >&2
11+
}
12+
13+
function success()
14+
{
15+
echo -e "\e[32m${1}\e[0m"
16+
}
17+
function info()
18+
{
19+
echo -e "\e[36m${1}\e[0m"
20+
}
21+
function warning()
22+
{
23+
if [[ "${2}" == "--underline" ]]
24+
then
25+
echo -e "\e[4;33m${1}\e[0m"
26+
else
27+
echo -e "\e[33m${1}\e[0m"
28+
fi
29+
}
30+
function error()
31+
{
32+
if [[ "${2}" == "--underline" ]]
33+
then
34+
echo -e "\e[4;31m${1}\e[0m"
35+
else
36+
echo -e "\e[31m${1}\e[0m"
37+
fi
38+
}
39+
40+
function replace_conf()
941
{
1042
local SEARCH_FOR="${1}"
1143
local REPLACE_WITH="${2}"
1244
local FILENAME="${3}"
1345

1446
sed -i "/^${SEARCH_FOR}/c\\${SEARCH_FOR} = ${REPLACE_WITH}" "${FILENAME}"
1547
}
16-
function _merge_confs()
48+
function merge_confs()
1749
{
1850
local FILENAME="${1}"
1951
local CONFIG_FILE="${2}"
@@ -27,43 +59,69 @@ function _merge_confs()
2759
local SEARCH_FOR="$(echo "${PROPERTY}" | cut -d '=' -f 1 | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
2860
local REPLACE_WITH="$(echo "${PROPERTY}" | cut -d '=' -f 2- | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
2961

30-
_replace_conf "${SEARCH_FOR}" "${REPLACE_WITH}" "${FILENAME}"
62+
replace_conf "${SEARCH_FOR}" "${REPLACE_WITH}" "${FILENAME}"
3163
fi
3264

3365
done < "${CONFIG_FILE}"
3466
}
3567

3668
# Sub-functions:
3769
#
38-
function compose_mangosd_conf()
70+
function compose_generic_conf_file()
71+
{
72+
local FILENAME="${1}"
73+
74+
if [[ ! -f "/opt/mangos/conf/${FILENAME}" ]]
75+
then
76+
return
77+
fi
78+
79+
cd "${MANGOS_DIR}/etc"
80+
81+
if [[ ! -f "${FILENAME}.dist" ]]
82+
then
83+
echoerr ""
84+
echoerr -e " $(error "ERROR!" --underline)"
85+
echoerr -e " $(error "└") The file \"$(info "${FILENAME}.dist")\" you're trying to"
86+
echoerr -e " compose the configuration from doesn't exist."
87+
88+
exit 2
89+
fi
90+
91+
cp "${FILENAME}.dist" "${FILENAME}"
92+
93+
merge_confs "${FILENAME}" "/opt/mangos/conf/${FILENAME}"
94+
}
95+
96+
function compose_mangosd_conf_file()
3997
{
4098
local MANGOS_DBCONN="${MANGOS_DBHOST};${MANGOS_DBPORT};${MANGOS_DBUSER};${MANGOS_DBPASS}"
4199

42100
cd "${MANGOS_DIR}/etc"
43101
cp mangosd.conf.dist mangosd.conf
44102

45-
_replace_conf "LoginDatabaseInfo" "\"${MANGOS_DBCONN};${MANGOS_REALMD_DBNAME}\"" mangosd.conf
46-
_replace_conf "WorldDatabaseInfo" "\"${MANGOS_DBCONN};${MANGOS_WORLD_DBNAME}\"" mangosd.conf
47-
_replace_conf "CharacterDatabaseInfo" "\"${MANGOS_DBCONN};${MANGOS_CHARACTERS_DBNAME}\"" mangosd.conf
48-
_replace_conf "LogsDatabaseInfo" "\"${MANGOS_DBCONN};${MANGOS_LOGS_DBNAME}\"" mangosd.conf
103+
replace_conf "LoginDatabaseInfo" "\"${MANGOS_DBCONN};${MANGOS_REALMD_DBNAME}\"" mangosd.conf
104+
replace_conf "WorldDatabaseInfo" "\"${MANGOS_DBCONN};${MANGOS_WORLD_DBNAME}\"" mangosd.conf
105+
replace_conf "CharacterDatabaseInfo" "\"${MANGOS_DBCONN};${MANGOS_CHARACTERS_DBNAME}\"" mangosd.conf
106+
replace_conf "LogsDatabaseInfo" "\"${MANGOS_DBCONN};${MANGOS_LOGS_DBNAME}\"" mangosd.conf
49107

50108
if [[ -f "/opt/mangos/conf/mangosd.conf" ]]
51109
then
52-
_merge_confs mangosd.conf "/opt/mangos/conf/mangosd.conf"
110+
merge_confs mangosd.conf "/opt/mangos/conf/mangosd.conf"
53111
fi
54112
}
55-
function compose_realmd_conf()
113+
function compose_realmd_conf_file()
56114
{
57115
local MANGOS_DBCONN="${MANGOS_DBHOST};${MANGOS_DBPORT};${MANGOS_DBUSER};${MANGOS_DBPASS}"
58116

59117
cd "${MANGOS_DIR}/etc"
60118
cp realmd.conf.dist realmd.conf
61119

62-
_replace_conf "LoginDatabaseInfo" "\"${MANGOS_DBCONN};${MANGOS_REALMD_DBNAME}\"" realmd.conf
120+
replace_conf "LoginDatabaseInfo" "\"${MANGOS_DBCONN};${MANGOS_REALMD_DBNAME}\"" realmd.conf
63121

64122
if [[ -f "/opt/mangos/conf/realmd.conf" ]]
65123
then
66-
_merge_confs realmd.conf "/opt/mangos/conf/realmd.conf"
124+
merge_confs realmd.conf "/opt/mangos/conf/realmd.conf"
67125
fi
68126
}
69127

@@ -86,8 +144,12 @@ function init_runner()
86144
{
87145
set_timezone
88146

89-
compose_mangosd_conf
90-
compose_realmd_conf
147+
compose_mangosd_conf_file
148+
compose_realmd_conf_file
149+
150+
compose_generic_conf_file "ahbot.conf"
151+
compose_generic_conf_file "aiplayerbot.conf"
152+
compose_generic_conf_file "anticheat.conf"
91153
}
92154

93155
function run_mangosd()

‎runner/run.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ readonly BASE_DIR="$(realpath "$(dirname "${0}")/..")"
77
source "${BASE_DIR}/.env"
88

99
readonly NAME="cmangos-runner"
10-
readonly IMAGE="ghcr.io/byloth/cmangos/${WOW_VERSION}"
11-
readonly VERSION="latest"
10+
# readonly IMAGE="ghcr.io/byloth/cmangos/${WOW_VERSION}"
11+
# readonly VERSION="latest"
12+
readonly IMAGE="byloth/cmangos-${WOW_VERSION}"
13+
readonly VERSION="develop"
1214

1315
readonly DATA_VOLUME="cmangos_mangosd_data"
1416
readonly NETWORK="cmangos_default"

0 commit comments

Comments
 (0)