diff --git a/install/install.py b/install/install.py index 7434da913..40f035e41 100755 --- a/install/install.py +++ b/install/install.py @@ -483,36 +483,6 @@ class preFlightsChecks: def fixCyberPanelPermissions(self): - try: - - writeToFile = open('/usr/local/lscp/cyberpanel/rainloop/data/data/default/configs/application.ini', 'a') - writeToFile.write(""" -[security] -admin_login = "admin" -admin_password = "12345789" -""") - writeToFile.close() - - - import randomPassword - - content = """SetPassword('%s'); -echo $oConfig->Save() ? 'Done' : 'Error'; - -?>""" % (randomPassword.generate_pass()) - - writeToFile = open('/usr/local/CyberCP/public/rainloop.php', 'w') - writeToFile.write(content) - writeToFile.close() - except: - pass - ###### fix Core CyberPanel permissions command = "usermod -G lscpd,lsadm,nobody lscpd" @@ -661,9 +631,6 @@ echo $oConfig->Save() ? 'Done' : 'Error'; ### - command = '/usr/local/lsws/lsphp72/bin/php /usr/local/CyberCP/public/rainloop.php' - preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) - def install_unzip(self): self.stdOut("Install unzip") try: @@ -2378,6 +2345,40 @@ def main(): checks.installCLScripts() #checks.disablePackegeUpdates() + + try: + + writeToFile = open('/usr/local/lscp/cyberpanel/rainloop/data/data/default/configs/application.ini', 'a') + writeToFile.write(""" +[security] +admin_login = "admin" +admin_password = "12345789" +""") + writeToFile.close() + + import randomPassword + + content = """SetPassword('%s'); +echo $oConfig->Save() ? 'Done' : 'Error'; + +?>""" % (randomPassword.generate_pass()) + + writeToFile = open('/usr/local/CyberCP/public/rainloop.php', 'w') + writeToFile.write(content) + writeToFile.close() + + command = '/usr/local/lsws/lsphp72/bin/php /usr/local/CyberCP/public/rainloop.php' + subprocess.call(shlex.split(command)) + + except: + pass + logging.InstallLog.writeToFile("CyberPanel installation successfully completed!")