respect remote mysql during upgrade

install/installCyberPanel.py

@@ -565,7 +565,7 @@ class InstallCyberPanel:
 
 
             if self.remotemysql == 'ON':
-                command = "sed -i 's|gmysql-host=127.0.0.1|gmysql-host=%s|g' %s" % (self.mysqlhost, dnsPath)
+                command = "sed -i 's|gmysql-host=localhost|gmysql-host=%s|g' %s" % (self.mysqlhost, dnsPath)
                 install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
 
                 command = "sed -i 's|gmysql-port=3306|gmysql-port=%s|g' %s" % (self.mysqlport, dnsPath)

plogical/mysqlUtilities.py

@@ -53,8 +53,23 @@ class mysqlUtilities:
     @staticmethod
     def setupConnection():
         try:
+
             passFile = "/etc/cyberpanel/mysqlPassword"
 
+            try:
+                jsonData = json.loads(open(passFile, 'r').read())
+
+                mysqluser = jsonData['mysqluser']
+                mysqlpassword = jsonData['mysqlpassword']
+                mysqlport = jsonData['mysqlport']
+                mysqlhost = jsonData['mysqlhost']
+
+                conn = mysql.connect(host=mysqlhost ,user=mysqluser, passwd=mysqlpassword, port=mysqlport, cursorclass=cursors.SSCursor)
+                cursor = conn.cursor()
+
+                return conn, cursor
+
+            except:
                 f = open(passFile)
                 data = f.read()
                 password = data.split('\n', 1)[0]
@@ -158,9 +173,24 @@ class mysqlUtilities:
     def createDatabaseBackup(databaseName, tempStoragePath):
         try:
             passFile = "/etc/cyberpanel/mysqlPassword"
+
+            try:
+                jsonData = json.loads(open(passFile, 'r').read())
+
+                mysqluser = jsonData['mysqluser']
+                mysqlpassword = jsonData['mysqlpassword']
+                mysqlport = jsonData['mysqlport']
+                mysqlhost = jsonData['mysqlhost']
+                password = mysqlpassword
+            except:
+                passFile = "/etc/cyberpanel/mysqlPassword"
                 f = open(passFile)
                 data = f.read()
                 password = data.split('\n', 1)[0]
+                mysqlhost = 'localhost'
+                mysqlport = '3306'
+                mysqluser = 'root'
+
 
             cnfPath = '/home/cyberpanel/.my.cnf'
 
@@ -178,7 +208,7 @@ password=%s
 
                 os.chmod(cnfPath, 0o600)
 
-            command = 'mysqldump --defaults-extra-file=/home/cyberpanel/.my.cnf --host=localhost ' + databaseName
+            command = 'mysqldump --defaults-extra-file=/home/cyberpanel/.my.cnf -u %s --host=%s --port %s %s' % (mysqluser, mysqlhost, mysqlport, databaseName)
             cmd = shlex.split(command)
 
             try:
@@ -205,9 +235,22 @@ password=%s
         try:
             passFile = "/etc/cyberpanel/mysqlPassword"
 
+            try:
+                jsonData = json.loads(open(passFile, 'r').read())
+
+                mysqluser = jsonData['mysqluser']
+                mysqlpassword = jsonData['mysqlpassword']
+                mysqlport = jsonData['mysqlport']
+                mysqlhost = jsonData['mysqlhost']
+                password = mysqlpassword
+            except:
+                passFile = "/etc/cyberpanel/mysqlPassword"
                 f = open(passFile)
                 data = f.read()
                 password = data.split('\n', 1)[0]
+                mysqlhost = 'localhost'
+                mysqlport = '3306'
+                mysqluser = 'root'
 
             cnfPath = '/home/cyberpanel/.my.cnf'
 
@@ -227,7 +270,7 @@ password=%s
                 command = 'chown cyberpanel:cyberpanel %s' % (cnfPath)
                 subprocess.call(shlex.split(command))
 
-            command = 'mysql --defaults-extra-file=/home/cyberpanel/.my.cnf --host=localhost ' + databaseName
+            command = 'mysql --defaults-extra-file=/home/cyberpanel/.my.cnf -u %s --host=%s --port %s' % (mysqluser, mysqlhost, mysqlport, databaseName)
             cmd = shlex.split(command)
 
             if additionalName == None:

plogical/upgrade.py

@@ -1392,6 +1392,8 @@ class Upgrade:
             dbName = settings.DATABASES['default']['NAME']
             dbUser = settings.DATABASES['default']['USER']
             password = settings.DATABASES['default']['PASSWORD']
+            host = settings.DATABASES['default']['HOST']
+            port = settings.DATABASES['default']['PORT']
 
             ## Root DB Creds
 
@@ -1407,18 +1409,18 @@ class Upgrade:
         'NAME': '%s',
         'USER': '%s',
         'PASSWORD': '%s',
-        'HOST': 'localhost',
-        'PORT':''
+        'HOST': '%s',
+        'PORT':'%s'
     },
     'rootdb': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': '%s',
         'USER': '%s',
         'PASSWORD': '%s',
-        'HOST': 'localhost',
-        'PORT': '',
+        'HOST': '%s',
+        'PORT': '%s',
     },
-}\n""" % (dbName, dbUser, password, rootdbName, rootdbdbUser, rootdbpassword)
+}\n""" % (dbName, dbUser, password, host, port, rootdbName, rootdbdbUser, rootdbpassword, host, port)
 
             settingsFile = '/usr/local/CyberCP/CyberCP/settings.py'