Merge branch 'stable' into v1.9.4

This commit is contained in:
Usman Nasir
2020-01-14 16:35:39 +05:00
2 changed files with 8 additions and 2 deletions

View File

@@ -658,6 +658,9 @@ class preFlightsChecks:
command = 'chmod +x %s' % (items)
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
command = 'chmod 600 /usr/local/CyberCP/plogical/adminPass.py'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
def install_unzip(self):
self.stdOut("Install unzip")
try:

View File

@@ -1659,6 +1659,9 @@ CSRF_COOKIE_SECURE = True
command = 'chmod +x %s' % (items)
Upgrade.executioner(command, 0)
command = 'chmod 600 /usr/local/CyberCP/plogical/adminPass.py'
Upgrade.executioner(command, 0)
Upgrade.stdOut("Permissions updated.")
except BaseException as msg:
@@ -2004,8 +2007,8 @@ service_port = 9000
if not os.path.exists('/usr/local/lsws/bin/openlitespeed'):
command = 'wget https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/install/litespeed/httpd_config.xml'
Upgrade.executioner(command, command, 0)
os.remove('/usr/local/lsws/conf/httpd_config.xml')
shutil.copy('httpd_config.xml', '/usr/local/lsws/conf/httpd_config.xml')
#os.remove('/usr/local/lsws/conf/httpd_config.xml')
#shutil.copy('httpd_config.xml', '/usr/local/lsws/conf/httpd_config.xml')
postfixPath = '/home/cyberpanel/postfix'
pdns = '/home/cyberpanel/pdns'