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

port MySQL Optimizer to Ubuntu

Browse Source
This commit is contained in:
usmannasir
2019-01-13 23:58:09 +05:00
parent a20fb0eec7
commit 245dbe068d
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cloudAPI/cloudManager.py
View File

@@ -1036,8 +1036,8 @@ class CloudManager:
if currentACL['admin'] == 0: if currentACL['admin'] == 0:
return self.ajaxPre(0, 'Only administrators can see MySQL status.') return self.ajaxPre(0, 'Only administrators can see MySQL status.')
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: #if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu:
return self.ajaxPre(0, 'This feature is currently only available on CentOS.') # return self.ajaxPre(0, 'This feature is currently only available on CentOS.')
from psutil import virtual_memory from psutil import virtual_memory

1
plogical/modSec.py
View File

@@ -219,7 +219,6 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/rules.conf
@staticmethod @staticmethod
def setupComodoRules(): def setupComodoRules():
try: try:
if ProcessUtilities.decideServer() == ProcessUtilities.OLS: if ProcessUtilities.decideServer() == ProcessUtilities.OLS:
pathTOOWASPFolder = os.path.join(virtualHostUtilities.Server_root, "conf/modsec/comodo") pathTOOWASPFolder = os.path.join(virtualHostUtilities.Server_root, "conf/modsec/comodo")
extractLocation = os.path.join(virtualHostUtilities.Server_root, "conf/modsec") extractLocation = os.path.join(virtualHostUtilities.Server_root, "conf/modsec")

2
plogical/mysqlUtilities.py
View File

@@ -320,6 +320,8 @@ class mysqlUtilities:
command = 'sudo mv /etc/my.cnf /etc/my.cnf.bak' command = 'sudo mv /etc/my.cnf /etc/my.cnf.bak'
else: else:
command = 'sudo mv /etc/mysql/my.cnf /etc/mysql/my.cnf.bak' command = 'sudo mv /etc/mysql/my.cnf /etc/mysql/my.cnf.bak'
data['suggestedContent'] = data['suggestedContent'].replace('/var/lib/mysql/mysql.sock', '/var/run/mysqld/mysqld.sock')
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)

7
plogical/upgrade.py
View File

@@ -700,6 +700,11 @@ WantedBy=multi-user.target"""
if items.find('s3Backups') > -1: if items.find('s3Backups') > -1:
s3Backups = 0 s3Backups = 0
dockerManager = 1
for items in data:
if items.find('dockerManager') > -1:
dockerManager = 0
Upgrade.stdOut('Restoring settings file!') Upgrade.stdOut('Restoring settings file!')
@@ -717,6 +722,8 @@ WantedBy=multi-user.target"""
writeToFile.writelines(" 'emailPremium',\n") writeToFile.writelines(" 'emailPremium',\n")
if s3Backups == 1: if s3Backups == 1:
writeToFile.writelines(" 's3Backups',\n") writeToFile.writelines(" 's3Backups',\n")
if dockerManager == 1:
writeToFile.writelines(" 'dockerManager',\n")
else: else:
writeToFile.writelines(items) writeToFile.writelines(items)