From a2feb3b4fdf51f7dbe3d2106f0c0baa3fdf971c1 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 12 Oct 2022 15:04:38 +0500 Subject: [PATCH 1/5] alma8 maria10.6: https://github.com/usmannasir/cyberpanel/issues/967 --- install/installCyberPanel.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index fc0d9d96b..a4e04dcb6 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -281,6 +281,20 @@ class InstallCyberPanel: elif self.distro == centos: command = 'yum --enablerepo=mariadb -y install MariaDB-server MariaDB-client' elif self.distro == cent8 or self.distro == openeuler: + ### check if cent8 which means Alma8 then add Mariadb 10.6 repo + if self.distro == cent8: + content = """ +[mariadb] +name = MariaDB +baseurl = http://yum.mariadb.org/10.6/rhel8-amd64 +module_hotfixes=1 +gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB +gpgcheck=1 +""" + writeToFile = open('/etc/yum.repos.d/mariadb.repo', 'w') + writeToFile.write(content) + writeToFile.close() + command = 'dnf -y install mariadb-server' install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) From 901f0b62be8ba9291bd4162f035b203414ab13aa Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 12 Oct 2022 16:48:33 +0500 Subject: [PATCH 2/5] bug fix: https://github.com/usmannasir/cyberpanel/issues/964 --- plogical/mysqlUtilities.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plogical/mysqlUtilities.py b/plogical/mysqlUtilities.py index 1ebdea397..d534b5c8f 100755 --- a/plogical/mysqlUtilities.py +++ b/plogical/mysqlUtilities.py @@ -629,8 +629,7 @@ password=%s checker = 0 for items in result: - if items[0] == 'information_schema' or items[0] == 'mysql' or items[0] == 'performance_schema' or items[ - 0] == 'performance_schema': + if items[0] == 'information_schema' or items[0] == 'mysql' or items[0] == 'performance_schema': continue dic = { From f4cff2f8c18059567e744d2f38c010f7041b9cd0 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 12 Oct 2022 17:04:01 +0500 Subject: [PATCH 3/5] first step towards fixing: https://github.com/usmannasir/cyberpanel/issues/963 --- plogical/mailUtilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py index 082d46ce8..3de6a077b 100755 --- a/plogical/mailUtilities.py +++ b/plogical/mailUtilities.py @@ -1079,7 +1079,7 @@ LogFile /var/log/clamav/clamav.log command = "cat " + path output = ProcessUtilities.outputExecutioner(command) - if output.find('content_filter=spamassassin') > -1: + if output.find('spamassassin') > -1 and output.find('user=spamd') > -1: return 1 else: return 0 From 2dfabdb433228fbbcc0c4860d21826acfc98dd18 Mon Sep 17 00:00:00 2001 From: CyberFlame Date: Fri, 14 Oct 2022 07:43:54 +0000 Subject: [PATCH 4/5] fix ubuntu22 bug caused by typo Signed-off-by: GitHub --- cyberpanel.sh | 4 ++-- cyberpanel.sh.bak | 2 +- cyberpanel_upgrade.sh | 2 +- install/venvsetup.sh | 2 +- install/venvsetup.sh.bak | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cyberpanel.sh b/cyberpanel.sh index fdedadcde..eeda7bc41 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -1022,10 +1022,10 @@ else fi if [[ "$Server_OS_Version" = "22" ]] ; then - DEBIAN_FRONTEND=noninteracitve apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git socat vim unzip zip libmariadb-dev-compat libmariadb-dev + DEBIAN_FRONTEND=noninteractive apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git socat vim unzip zip libmariadb-dev-compat libmariadb-dev Check_Return else - DEBIAN_FRONTEND=noninteracitve apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git socat vim unzip zip + DEBIAN_FRONTEND=noninteractive apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git socat vim unzip zip Check_Return fi diff --git a/cyberpanel.sh.bak b/cyberpanel.sh.bak index 557b3d496..e472576a9 100644 --- a/cyberpanel.sh.bak +++ b/cyberpanel.sh.bak @@ -998,7 +998,7 @@ else apt install -y --allow-downgrades libgnutls30=3.6.13-2ubuntu1.3 fi - DEBIAN_FRONTEND=noninteracitve apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git socat vim unzip zip + DEBIAN_FRONTEND=noninteractive apt install -y dnsutils net-tools htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git socat vim unzip zip Check_Return DEBIAN_FRONTEND=noninteractive apt install -y python3-pip diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh index 612c15aeb..36b72f81b 100644 --- a/cyberpanel_upgrade.sh +++ b/cyberpanel_upgrade.sh @@ -422,7 +422,7 @@ elif [[ "$Server_OS" = "Ubuntu" ]] ; then apt update -y DEBIAN_FRONTEND=noninteractive apt upgrade -y - DEBIAN_FRONTEND=noninteracitve apt install -y htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git dnsutils + DEBIAN_FRONTEND=noninteractive apt install -y htop telnet libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev virtualenv git dnsutils DEBIAN_FRONTEND=noninteractive apt install -y python3-pip DEBIAN_FRONTEND=noninteractive apt install -y build-essential libssl-dev libffi-dev python3-dev DEBIAN_FRONTEND=noninteractive apt install -y python3-venv diff --git a/install/venvsetup.sh b/install/venvsetup.sh index 0bc90cf9a..4adf8aac5 100644 --- a/install/venvsetup.sh +++ b/install/venvsetup.sh @@ -349,7 +349,7 @@ fi if [[ $SERVER_OS == "Ubuntu" ]] ; then apt update -y DEBIAN_FRONTEND=noninteractive apt upgrade -y - DEBIAN_FRONTEND=noninteracitve apt install -y htop telnet python-mysqldb python-dev libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev python-gpg python python-minimal python-setuptools virtualenv python-dev python-pip git + DEBIAN_FRONTEND=noninteractive apt install -y htop telnet python-mysqldb python-dev libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev python-gpg python python-minimal python-setuptools virtualenv python-dev python-pip git if [[ $DEV == "ON" ]] ; then DEBIAN_FRONTEND=noninteractive apt install -y python3-pip DEBIAN_FRONTEND=noninteractive apt install -y build-essential libssl-dev libffi-dev python3-dev diff --git a/install/venvsetup.sh.bak b/install/venvsetup.sh.bak index b32d97fe7..959d69ab0 100644 --- a/install/venvsetup.sh.bak +++ b/install/venvsetup.sh.bak @@ -349,7 +349,7 @@ fi if [[ $SERVER_OS == "Ubuntu" ]] ; then apt update -y DEBIAN_FRONTEND=noninteractive apt upgrade -y - DEBIAN_FRONTEND=noninteracitve apt install -y htop telnet python-mysqldb python-dev libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev python-gpg python python-minimal python-setuptools virtualenv python-dev python-pip git + DEBIAN_FRONTEND=noninteractive apt install -y htop telnet python-mysqldb python-dev libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev python-gpg python python-minimal python-setuptools virtualenv python-dev python-pip git if [[ $DEV == "ON" ]] ; then DEBIAN_FRONTEND=noninteractive apt install -y python3-pip DEBIAN_FRONTEND=noninteractive apt install -y build-essential libssl-dev libffi-dev python3-dev From 0a7c95e78f9cb3c8fa3b3a3f04098ad040b83796 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 14 Oct 2022 14:02:20 +0500 Subject: [PATCH 5/5] reverse mariadb upgrade --- install/installCyberPanel.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index a4e04dcb6..f73bf8ef8 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -282,18 +282,18 @@ class InstallCyberPanel: command = 'yum --enablerepo=mariadb -y install MariaDB-server MariaDB-client' elif self.distro == cent8 or self.distro == openeuler: ### check if cent8 which means Alma8 then add Mariadb 10.6 repo - if self.distro == cent8: - content = """ -[mariadb] -name = MariaDB -baseurl = http://yum.mariadb.org/10.6/rhel8-amd64 -module_hotfixes=1 -gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB -gpgcheck=1 -""" - writeToFile = open('/etc/yum.repos.d/mariadb.repo', 'w') - writeToFile.write(content) - writeToFile.close() +# if self.distro == cent8: +# content = """ +# [mariadb] +# name = MariaDB +# baseurl = http://yum.mariadb.org/10.6/rhel8-amd64 +# module_hotfixes=1 +# gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB +# gpgcheck=1 +# """ +# writeToFile = open('/etc/yum.repos.d/mariadb.repo', 'w') +# writeToFile.write(content) +# writeToFile.close() command = 'dnf -y install mariadb-server'