pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-07 21:32:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server into feature/eqemu-api-data-service-netstats-ws

Browse Source
This commit is contained in:
Akkadius 2019-07-03 00:36:26 -05:00
commit dce5d774e2
3 changed files with 68 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
utils/scripts/linux_installer/install.sh
View File

@ -126,8 +126,9 @@ if [[ "$OS" == "Debian" ]]; then
apt-get $apt_options install libssl-dev apt-get $apt_options install libssl-dev
# Install libsodium # Install libsodium
wget http://ftp.us.debian.org/debian/pool/main/libs/libsodium/libsodium-dev_1.0.11-1~bpo8+1_amd64.deb -O /home/eqemu/libsodium-dev.deb wget http://ftp.us.debian.org/debian/pool/main/libs/libsodium/libsodium-dev_1.0.11-2_amd64.deb -O /home/eqemu/libsodium-dev.deb
wget http://ftp.us.debian.org/debian/pool/main/libs/libsodium/libsodium18_1.0.11-1~bpo8+1_amd64.deb -O /home/eqemu/libsodium18.deb wget http://ftp.us.debian.org/debian/pool/main/libs/libsodium/libsodium18_1.0.11-2_amd64.deb -O /home/eqemu/libsodium18.deb
dpkg -i /home/eqemu/libsodium*.deb dpkg -i /home/eqemu/libsodium*.deb
# Cleanup after ourselves # Cleanup after ourselves
rm -f /home/eqemu/libsodium-dev.deb rm -f /home/eqemu/libsodium-dev.deb
@ -146,61 +147,75 @@ if [[ "$OS" == "Debian" ]]; then
elif [[ "$OS" == "red_hat" ]]; then elif [[ "$OS" == "red_hat" ]]; then
# Do RedHat / CentOS stuff # Do RedHat / CentOS stuff
# Add the MariaDB repository to yum
cat <<EOF > /etc/yum.repos.d/mariadb.repo
# MariaDB 10.1 CentOS repository list - created 2016-08-20 05:42 UTC
# http://downloads.mariadb.org/mariadb/repositories/
[mariadb]
name = MariaDB
baseurl = http://yum.mariadb.org/10.1/centos7-amd64
gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
enabled=1
gpgcheck=1
EOF
# Install prereqs # Install prereqs
yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm yum -y install epel-release deltarpm
yum -y install deltarpm yum -y update
yum -y install open-vm-tools vim cmake boost-* zlib-devel mariadb-server mariadb-client mariadb-devel mariadb-libs mariadb-compat perl-* lua* dos2unix php-mysql proftpd libuuid-devel yum -y install \
yum -y groupinstall "Development Tools" "Basic Web Server" "Compatibility Libraries" open-vm-tools \
vim \
cmake \
boost-* \
zlib-devel \
mariadb \
mariadb-server \
mariadb-devel \
mariadb-libs \
perl-DBD-MySQL \
perl-JSON \
perl-IO-stringy \
perl-devel \
perl-Time-HiRes \
lua-devel \
dos2unix \
php-mysql \
proftpd \
libuuid-devel \
libsodium \
libsodium-devel \
openssl-devel
yum -y groupinstall \
"Development Tools" \
"Basic Web Server" \
"Compatibility Libraries"
elif [[ "$OS" == "fedora_core" ]]; then elif [[ "$OS" == "fedora_core" ]]; then
# Do Fedora stuff # Do Fedora stuff
dnf -y install open-vm-tools dnf -y install \
dnf -y install vim open-vm-tools \
dnf -y install cmake vim \
dnf -y install boost-devel cmake \
dnf -y install zlib-devel boost-devel \
dnf -y install mariadb-server zlib-devel \
dnf -y install mariadb-devel mariadb-server \
dnf -y install mariadb-libs mariadb-devel \
dnf -y install perl perl \
dnf -y install perl-DBD-MySQL perl-DBD-MySQL \
dnf -y install perl-IO-stringy perl-IO-stringy \
dnf -y install perl-devel perl-devel \
dnf -y install lua-devel lua-devel \
dnf -y install lua-sql-mysql lua-sql-mysql \
dnf -y install dos2unix dos2unix \
dnf -y install php-mysql php-mysqlnd \
dnf -y install php-mysqlnd proftpd \
dnf -y install proftpd wget \
dnf -y install wget compat-lua-libs \
dnf -y install compat-lua-libs compat-lua-devel \
dnf -y install compat-lua-devel compat-lua \
dnf -y install compat-lua perl-Time-HiRes \
dnf -y install perl-Time-HiRes perl-JSON \
dnf -y install libuuid-devel libuuid-devel \
dnf -y install libsodium libsodium \
dnf -y install libsodium-devel libsodium-devel \
dnf -y groupinstall "Development Tools" openssl-devel
dnf -y groupinstall "Basic Web Server"
dnf -y groupinstall "C Development Tools and Libraries" dnf -y group install "Development Tools" "Basic Web Server" "C Development Tools and Libraries"
fi fi
if [[ "$OS" == "fedora_core" ]] || [[ "$OS" == "red_hat" ]]; then if [[ "$OS" == "fedora_core" ]] || [[ "$OS" == "red_hat" ]]; then
# Start MariaDB server and set root password # Start MariaDB server and set root password
echo "Starting MariaDB server..." echo "Starting MariaDB server..."
systemctl enable mariadb.service systemctl enable mariadb.service --now
systemctl start mariadb.service
sleep 5 sleep 5
/usr/bin/mysqladmin -u root password $eqemu_db_root_password /usr/bin/mysqladmin -u root password $eqemu_db_root_password
fi fi

1
utils/sql/system_tables.txt
View File

@ -82,6 +82,7 @@ perl_event_export_settings
pets pets
pets_equipmentset pets_equipmentset
pets_equipmentset_entries pets_equipmentset_entries
profanity_list
proximities proximities
races races
saylink saylink

8
zone/worldserver.cpp
View File

@ -1773,10 +1773,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
} }
case ServerOP_ReloadRules: { case ServerOP_ReloadRules: {
worldserver.SendEmoteMessage( worldserver.SendEmoteMessage(
0, 0, 0, 15, 0, 0, 100, 15,
"Rules reloaded for Zone: '%s' Instance ID: %u", "Rules reloaded for Zone: '%s' Instance ID: %u",
zone->GetLongName(), zone->GetLongName(),
zone->GetInstanceID() zone->GetInstanceID()
); );
RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true); RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true);
break; break;