From 2a308b1f14f8f803131a184ff963a2f3f027d03f Mon Sep 17 00:00:00 2001 From: James Lavoy Date: Sat, 15 Jun 2019 12:07:08 -0600 Subject: [PATCH 1/4] moderning and updating installer script fixing tabs adding perl-json adding sodium adding openssl removing debian stuff, refactoring rhel stuff changing some fedora stuff more fedora crap dnf doesn't like newlines in group install? --- utils/scripts/linux_installer/install.sh | 106 +++++++++++++---------- 1 file changed, 60 insertions(+), 46 deletions(-) diff --git a/utils/scripts/linux_installer/install.sh b/utils/scripts/linux_installer/install.sh index 386503119..b35767fa1 100644 --- a/utils/scripts/linux_installer/install.sh +++ b/utils/scripts/linux_installer/install.sh @@ -146,61 +146,75 @@ if [[ "$OS" == "Debian" ]]; then elif [[ "$OS" == "red_hat" ]]; then # Do RedHat / CentOS stuff - # Add the MariaDB repository to yum -cat < /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 - yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - yum -y install deltarpm - 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 groupinstall "Development Tools" "Basic Web Server" "Compatibility Libraries" + yum -y install epel-release deltarpm + yum -y update + yum -y install \ + 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 # Do Fedora stuff - dnf -y install open-vm-tools - dnf -y install vim - dnf -y install cmake - dnf -y install boost-devel - dnf -y install zlib-devel - dnf -y install mariadb-server - dnf -y install mariadb-devel - dnf -y install mariadb-libs - dnf -y install perl - dnf -y install perl-DBD-MySQL - dnf -y install perl-IO-stringy - dnf -y install perl-devel - dnf -y install lua-devel - dnf -y install lua-sql-mysql - dnf -y install dos2unix - dnf -y install php-mysql - dnf -y install php-mysqlnd - dnf -y install proftpd - dnf -y install wget - dnf -y install compat-lua-libs - dnf -y install compat-lua-devel - dnf -y install compat-lua - dnf -y install perl-Time-HiRes - dnf -y install libuuid-devel - dnf -y install libsodium - dnf -y install libsodium-devel - dnf -y groupinstall "Development Tools" - dnf -y groupinstall "Basic Web Server" - dnf -y groupinstall "C Development Tools and Libraries" + dnf -y install \ + open-vm-tools \ + vim \ + cmake \ + boost-devel \ + zlib-devel \ + mariadb-server \ + mariadb-devel \ + perl \ + perl-DBD-MySQL \ + perl-IO-stringy \ + perl-devel \ + lua-devel \ + lua-sql-mysql \ + dos2unix \ + php-mysqlnd \ + proftpd \ + wget \ + compat-lua-libs \ + compat-lua-devel \ + compat-lua \ + perl-Time-HiRes \ + perl-JSON \ + libuuid-devel \ + libsodium \ + libsodium-devel \ + openssl-devel + + dnf -y group install "Development Tools" "Basic Web Server" "C Development Tools and Libraries" fi if [[ "$OS" == "fedora_core" ]] || [[ "$OS" == "red_hat" ]]; then # Start MariaDB server and set root password echo "Starting MariaDB server..." - systemctl enable mariadb.service - systemctl start mariadb.service + systemctl enable mariadb.service --now sleep 5 /usr/bin/mysqladmin -u root password $eqemu_db_root_password fi From a4f68f755f2e36d8e883f3d4abf35f9850a6b213 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 1 Jul 2019 02:52:06 -0500 Subject: [PATCH 2/4] Update system_tables.txt --- utils/sql/system_tables.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/sql/system_tables.txt b/utils/sql/system_tables.txt index f2d9f7529..a33605130 100644 --- a/utils/sql/system_tables.txt +++ b/utils/sql/system_tables.txt @@ -82,6 +82,7 @@ perl_event_export_settings pets pets_equipmentset pets_equipmentset_entries +profanity_list proximities races saylink From 6e51783d4bf8a31da4a8b7e1de675edbafee5dc3 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 1 Jul 2019 15:37:12 -0500 Subject: [PATCH 3/4] Don't send reload all rules messages to non-gm's --- zone/worldserver.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index c2e094ee9..497d6711a 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -1773,10 +1773,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) } case ServerOP_ReloadRules: { worldserver.SendEmoteMessage( - 0, 0, 0, 15, - "Rules reloaded for Zone: '%s' Instance ID: %u", - zone->GetLongName(), - zone->GetInstanceID() + 0, 0, 100, 15, + "Rules reloaded for Zone: '%s' Instance ID: %u", + zone->GetLongName(), + zone->GetInstanceID() ); RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true); break; From a42d77c204f75e71e0f7ab4fd7213b75d806f278 Mon Sep 17 00:00:00 2001 From: Kurt Gilpin Date: Mon, 1 Jul 2019 22:29:51 -0500 Subject: [PATCH 4/4] Updated libsodium18 package location for Ubuntu --- utils/scripts/linux_installer/install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/scripts/linux_installer/install.sh b/utils/scripts/linux_installer/install.sh index b35767fa1..6af4a9df3 100644 --- a/utils/scripts/linux_installer/install.sh +++ b/utils/scripts/linux_installer/install.sh @@ -126,8 +126,9 @@ if [[ "$OS" == "Debian" ]]; then apt-get $apt_options install libssl-dev # 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/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/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-2_amd64.deb -O /home/eqemu/libsodium18.deb + dpkg -i /home/eqemu/libsodium*.deb # Cleanup after ourselves rm -f /home/eqemu/libsodium-dev.deb