diff --git a/install/install.py b/install/install.py index 4abc90210..bc1dbe23f 100755 --- a/install/install.py +++ b/install/install.py @@ -90,6 +90,7 @@ def get_Ubuntu_release(): class preFlightsChecks: cyberPanelMirror = "mirror.cyberpanel.net/pip" + cdn = 'cdn.cyberpanel.sh' def __init__(self, rootPath, ip, path, cwd, cyberPanelPath, distro): self.ipAddr = ip @@ -677,19 +678,30 @@ class preFlightsChecks: if not os.path.exists("/usr/local/CyberCP/public"): os.mkdir("/usr/local/CyberCP/public") - os.chdir("/usr/local/CyberCP/public") - - command = 'composer create-project phpmyadmin/phpmyadmin' + command = 'wget -O /usr/local/CyberCP/public/phpmyadmin.zip https://%s/misc/phpmyadmin.zip' % (preFlightsChecks.cdn) preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]', - 'Download PHPMYAdmin', 1, 0, os.EX_OSERR) + command, 1, 0, os.EX_OSERR) + + command = 'unzip /usr/local/CyberCP/public/phpmyadmin.zip -d /usr/local/CyberCP/public/' + preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]', + command, 1, 0, os.EX_OSERR) + + command = 'mv /usr/local/CyberCP/public/phpMyAdmin-5.0.0-all-languages /usr/local/CyberCP/public/phpmyadmin' + preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]', + command, 1, 0, os.EX_OSERR) + + command = 'rm -f /usr/local/CyberCP/public/phpmyadmin.zip' + preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]', + command, 1, 0, os.EX_OSERR) + ## Write secret phrase rString = ''.join([random.choice(string.ascii_letters + string.digits) for n in range(32)]) - data = open('phpmyadmin/config.sample.inc.php', 'r').readlines() + data = open('/usr/local/CyberCP/public/phpmyadmin/config.sample.inc.php', 'r').readlines() - writeToFile = open('phpmyadmin/config.inc.php', 'w') + writeToFile = open('/usr/local/CyberCP/public/phpmyadmin/config.inc.php', 'w') for items in data: if items.find('blowfish_secret') > -1: @@ -1391,7 +1403,7 @@ imap_folder_list_limit = 0 try: os.remove("/usr/local/lscp/fcgi-bin/lsphp") - shutil.copy("/usr/local/lsws/lsphp71/bin/lsphp", "/usr/local/lscp/fcgi-bin/lsphp") + shutil.copy("/usr/local/lsws/lsphp72/bin/lsphp", "/usr/local/lscp/fcgi-bin/lsphp") except: pass diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 02b21d0bf..32b4209a2 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -22,6 +22,7 @@ from mailServer.models import EUsers class Upgrade: logPath = "/usr/local/lscp/logs/upgradeLog" + cdn = 'cdn.cyberpanel.sh' @staticmethod def stdOut(message, do_exit=0): @@ -225,9 +226,17 @@ class Upgrade: except: pass - os.chdir("/usr/local/CyberCP/public") + command = 'wget -O /usr/local/CyberCP/public/phpmyadmin.zip https://%s/misc/phpmyadmin.zip' % ( + Upgrade.cdn) + Upgrade.executioner(command, 0) - command = '/usr/local/lsws/lsphp71/bin/php /usr/bin/composer create-project phpmyadmin/phpmyadmin' + command = 'unzip /usr/local/CyberCP/public/phpmyadmin.zip -d /usr/local/CyberCP/public/' + Upgrade.executioner(command, 0) + + command = 'mv /usr/local/CyberCP/public/phpMyAdmin-5.0.0-all-languages /usr/local/CyberCP/public/phpmyadmin' + Upgrade.executioner(command, 0) + + command = 'rm -f /usr/local/CyberCP/public/phpmyadmin.zip' Upgrade.executioner(command, 0) ## Write secret phrase