From 8fe8ed52283446047fb294aaff37ff503e9715ea Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 13 Nov 2019 19:37:55 +0500 Subject: [PATCH 1/4] dont stop on repo fail --- install/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install.py b/install/install.py index 16fa2610a..389b73832 100755 --- a/install/install.py +++ b/install/install.py @@ -468,7 +468,7 @@ class preFlightsChecks: preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) else: command = 'yum -y install http://repo.iotti.biz/CentOS/7/noarch/lux-release-7-1.noarch.rpm' - preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) + preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) command = 'yum install git -y' preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) From 1feb9e27db973965bcc50370482a7706bd415f4f Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 13 Nov 2019 19:59:42 +0500 Subject: [PATCH 2/4] omit from log --- install/install.py | 1 + install/installCyberPanel.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/install.py b/install/install.py index 389b73832..9ce0c9892 100755 --- a/install/install.py +++ b/install/install.py @@ -132,6 +132,7 @@ class preFlightsChecks: if log: logging.InstallLog.writeToFile(message) if do_exit: + logging.InstallLog.writeToFile(message) sys.exit(code) def mountTemp(self): diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index 5df300c29..badfef6cf 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -3,7 +3,6 @@ import subprocess import os from mysqlUtilities import mysqlUtilities import installLog as logging -import shlex import randomPassword import errno import MySQLdb as mariadb @@ -279,7 +278,7 @@ class InstallCyberPanel: command = 'mysql -u root -e "' + passwordCMD + '"' - install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) + install.preFlightsChecks.call(command, self.distro, command, command, 0, 0, os.EX_OSERR) def startMariaDB(self): From 4edba3372f6ceadebecc35f61165dfdb700f4355 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Thu, 14 Nov 2019 11:41:17 +0500 Subject: [PATCH 3/4] bug fix: remove csf apps during upgrade --- plogical/upgrade.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 8d7c3db70..2c52ff5bf 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -1398,6 +1398,8 @@ class Upgrade: writeToFile = open("/usr/local/CyberCP/CyberCP/settings.py", 'w') for items in data: + if items.find('csf') > -1: + continue if items.find("CommonMiddleware") > -1: if csrfCheck == 1: writeToFile.writelines(" 'django.middleware.csrf.CsrfViewMiddleware',\n") @@ -1444,8 +1446,6 @@ CSRF_COOKIE_SECURE = True MEDIA_URL = 1 for items in data: - if items.find('csf') > -1: - continue if items.find('MEDIA_URL') > -1: MEDIA_URL = 0 From 94587e66b6bb6d3657fc38ffdfb8642d198ec85a Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Thu, 14 Nov 2019 13:18:01 +0500 Subject: [PATCH 4/4] remove install message --- install/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install.py b/install/install.py index 9ce0c9892..9289c4881 100755 --- a/install/install.py +++ b/install/install.py @@ -2336,7 +2336,7 @@ def main(): checks.setUpFirstAccount() # checks.p3(distro) logging.InstallLog.writeToFile("CyberPanel installation successfully completed!") - checks.installation_successfull() + #checks.installation_successfull() if __name__ == "__main__":