diff --git a/cloudAPI/cloudManager.py b/cloudAPI/cloudManager.py index 4902b3a50..1df9c4fcd 100644 --- a/cloudAPI/cloudManager.py +++ b/cloudAPI/cloudManager.py @@ -1036,8 +1036,8 @@ class CloudManager: if currentACL['admin'] == 0: return self.ajaxPre(0, 'Only administrators can see MySQL status.') - if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: - return self.ajaxPre(0, 'This feature is currently only available on CentOS.') + #if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: + # return self.ajaxPre(0, 'This feature is currently only available on CentOS.') from psutil import virtual_memory diff --git a/plogical/modSec.py b/plogical/modSec.py index 26e67dd95..d9d0faa9d 100644 --- a/plogical/modSec.py +++ b/plogical/modSec.py @@ -219,7 +219,6 @@ modsecurity_rules_file /usr/local/lsws/conf/modsec/rules.conf @staticmethod def setupComodoRules(): try: - if ProcessUtilities.decideServer() == ProcessUtilities.OLS: pathTOOWASPFolder = os.path.join(virtualHostUtilities.Server_root, "conf/modsec/comodo") extractLocation = os.path.join(virtualHostUtilities.Server_root, "conf/modsec") diff --git a/plogical/mysqlUtilities.py b/plogical/mysqlUtilities.py index 795fe8e8a..88f6297eb 100644 --- a/plogical/mysqlUtilities.py +++ b/plogical/mysqlUtilities.py @@ -320,6 +320,8 @@ class mysqlUtilities: command = 'sudo mv /etc/my.cnf /etc/my.cnf.bak' else: 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) diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 72c75a9de..1850603ba 100644 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -700,6 +700,11 @@ WantedBy=multi-user.target""" if items.find('s3Backups') > -1: s3Backups = 0 + dockerManager = 1 + for items in data: + if items.find('dockerManager') > -1: + dockerManager = 0 + Upgrade.stdOut('Restoring settings file!') @@ -717,6 +722,8 @@ WantedBy=multi-user.target""" writeToFile.writelines(" 'emailPremium',\n") if s3Backups == 1: writeToFile.writelines(" 's3Backups',\n") + if dockerManager == 1: + writeToFile.writelines(" 'dockerManager',\n") else: writeToFile.writelines(items)