Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-01 19:06:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1568 from master3395/v2.5.5-dev

Browse Source 
V2.5.5 dev
This commit is contained in:
Master3395
2025-09-25 22:46:35 +02:00
committed by GitHub
parent f9545f475a d93e3a0439
commit 28fb945a68
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CPScripts/mailscannerinstaller.sh
View File

@@ -295,7 +295,7 @@ IPADDRESS=$(cat /etc/cyberpanel/machineIP)
# #
#elif [ "$CENTOSVERSION" = "VERSION_ID=\"8\"" ]; then #elif [ "$CENTOSVERSION" = "VERSION_ID=\"8\"" ]; then
# #
# rpm -Uvh http://mirror.ghettoforge.net/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm # rpm -Uvh https://mirror.ghettoforge.net/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm
# dnf --enablerepo=gf-plus upgrade -y dovecot23* # dnf --enablerepo=gf-plus upgrade -y dovecot23*
# dnf --enablerepo=gf-plus install -y dovecot23-pigeonhole # dnf --enablerepo=gf-plus install -y dovecot23-pigeonhole
# dnf install -y net-tools postfix-perl-scripts # dnf install -y net-tools postfix-perl-scripts

2
CPScripts/spamassassin_tojunk_installer.sh
View File

@@ -40,7 +40,7 @@ elif [ "$CENTOSVERSION" = "VERSION_ID=\"7\"" ];then
elif [ "$CENTOSVERSION" = "VERSION_ID=\"8\"" ];then elif [ "$CENTOSVERSION" = "VERSION_ID=\"8\"" ];then
rpm -Uvh http://mirror.ghettoforge.net/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm rpm -Uvh https://mirror.ghettoforge.net/distributions/gf/el/8/gf/x86_64/gf-release-8-11.gf.el8.noarch.rpm
dnf --enablerepo=gf-plus upgrade -y dovecot23* dnf --enablerepo=gf-plus upgrade -y dovecot23*
dnf --enablerepo=gf-plus install -y dovecot23-pigeonhole dnf --enablerepo=gf-plus install -y dovecot23-pigeonhole
dnf install -y net-tools postfix-perl-scripts dnf install -y net-tools postfix-perl-scripts

4
cyberpanel_upgrade.sh
View File

@@ -441,8 +441,8 @@ EOF
# use MariaDB Mirror # use MariaDB Mirror
sed -i 's|https://download.copr.fedorainfracloud.org|https://cyberpanel.sh/download.copr.fedorainfracloud.org|g' /etc/yum.repos.d/_copr_copart-restic.repo sed -i 's|https://download.copr.fedorainfracloud.org|https://cyberpanel.sh/download.copr.fedorainfracloud.org|g' /etc/yum.repos.d/_copr_copart-restic.repo
sed -i 's|http://repo.iotti.biz|https://cyberpanel.sh/repo.iotti.biz|g' /etc/yum.repos.d/frank.repo sed -i 's|http://repo.iotti.biz|https://cyberpanel.sh/repo.iotti.biz|g' /etc/yum.repos.d/frank.repo
sed -i "s|mirrorlist=http://mirrorlist.ghettoforge.org/el/7/gf/\$basearch/mirrorlist|baseurl=https://cyberpanel.sh/mirror.ghettoforge.net/distributions/gf/el/7/gf/x86_64/|g" /etc/yum.repos.d/gf.repo sed -i "s|mirrorlist=https://mirrorlist.ghettoforge.net/el/7/gf/\$basearch/mirrorlist|baseurl=https://cyberpanel.sh/mirror.ghettoforge.net/distributions/gf/el/7/gf/x86_64/|g" /etc/yum.repos.d/gf.repo
sed -i "s|mirrorlist=http://mirrorlist.ghettoforge.org/el/7/plus/\$basearch/mirrorlist|baseurl=https://cyberpanel.sh/mirror.ghettoforge.net/distributions/gf/el/7/plus/x86_64/|g" /etc/yum.repos.d/gf.repo sed -i "s|mirrorlist=https://mirrorlist.ghettoforge.net/el/7/plus/\$basearch/mirrorlist|baseurl=https://cyberpanel.sh/mirror.ghettoforge.net/distributions/gf/el/7/plus/x86_64/|g" /etc/yum.repos.d/gf.repo
sed -i 's|https://repo.ius.io|https://cyberpanel.sh/repo.ius.io|g' /etc/yum.repos.d/ius.repo sed -i 's|https://repo.ius.io|https://cyberpanel.sh/repo.ius.io|g' /etc/yum.repos.d/ius.repo
sed -i 's|http://repo.iotti.biz|https://cyberpanel.sh/repo.iotti.biz|g' /etc/yum.repos.d/lux.repo sed -i 's|http://repo.iotti.biz|https://cyberpanel.sh/repo.iotti.biz|g' /etc/yum.repos.d/lux.repo
sed -i 's|http://repo.powerdns.com|https://cyberpanel.sh/repo.powerdns.com|g' /etc/yum.repos.d/powerdns-auth-43.repo sed -i 's|http://repo.powerdns.com|https://cyberpanel.sh/repo.powerdns.com|g' /etc/yum.repos.d/powerdns-auth-43.repo

6
install/install.py
View File

@@ -1737,7 +1737,7 @@ class preFlightsChecks:
self.install_package("psmisc") self.install_package("psmisc")
def update_settings_file(self, mysqlPassword, password): def update_settings_file(self, mysqlPassword, password, mysql):
""" """
Update settings.py file with correct passwords (working version approach) Update settings.py file with correct passwords (working version approach)
""" """
@@ -1994,7 +1994,7 @@ password="%s"
self.cyberpanel_db_password = password self.cyberpanel_db_password = password
# Update settings.py with correct passwords (no .env files needed) # Update settings.py with correct passwords (no .env files needed)
self.update_settings_file(mysqlPassword, self.cyberpanel_db_password) self.update_settings_file(mysqlPassword, self.cyberpanel_db_password, mysql)
logging.InstallLog.writeToFile("Environment configuration generated successfully!") logging.InstallLog.writeToFile("Environment configuration generated successfully!")
@@ -5233,7 +5233,7 @@ def main():
checks.installFirewalld() checks.installFirewalld()
checks.install_default_keys() checks.install_default_keys()
checks.download_install_CyberPanel(checks.cyberpanel_db_password, mysql) checks.download_install_CyberPanel(checks.mysqlpassword, mysql)
checks.downoad_and_install_raindloop() checks.downoad_and_install_raindloop()
checks.download_install_phpmyadmin() checks.download_install_phpmyadmin()
checks.setupCLI() checks.setupCLI()