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

respect remote mysql during upgrade

Browse Source
This commit is contained in:
Usman Nasir
2020-07-06 12:57:22 +05:00
parent 135bb2494a
commit 3b99510f58
3 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/installCyberPanel.py
View File

@@ -565,7 +565,7 @@ class InstallCyberPanel:
if self.remotemysql == 'ON': 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) 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) command = "sed -i 's|gmysql-port=3306|gmysql-port=%s|g' %s" % (self.mysqlport, dnsPath)

73
plogical/mysqlUtilities.py
View File

@@ -53,17 +53,32 @@ class mysqlUtilities:
@staticmethod @staticmethod
def setupConnection(): def setupConnection():
try: try:
passFile = "/etc/cyberpanel/mysqlPassword" passFile = "/etc/cyberpanel/mysqlPassword"
f = open(passFile) try:
data = f.read() jsonData = json.loads(open(passFile, 'r').read())
password = data.split('\n', 1)[0]
password = password.strip('\n').strip('\r')
conn = mysql.connect(user='root', passwd=password, cursorclass=cursors.SSCursor) mysqluser = jsonData['mysqluser']
cursor = conn.cursor() mysqlpassword = jsonData['mysqlpassword']
mysqlport = jsonData['mysqlport']
mysqlhost = jsonData['mysqlhost']
return conn, cursor 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]
password = password.strip('\n').strip('\r')
conn = mysql.connect(user='root', passwd=password, cursorclass=cursors.SSCursor)
cursor = conn.cursor()
return conn, cursor
except BaseException as msg: except BaseException as msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg)) logging.CyberCPLogFileWriter.writeToFile(str(msg))
@@ -158,9 +173,24 @@ class mysqlUtilities:
def createDatabaseBackup(databaseName, tempStoragePath): def createDatabaseBackup(databaseName, tempStoragePath):
try: try:
passFile = "/etc/cyberpanel/mysqlPassword" passFile = "/etc/cyberpanel/mysqlPassword"
f = open(passFile)
data = f.read() try:
password = data.split('\n', 1)[0] 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' cnfPath = '/home/cyberpanel/.my.cnf'
@@ -178,7 +208,7 @@ password=%s
os.chmod(cnfPath, 0o600) 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) cmd = shlex.split(command)
try: try:
@@ -205,9 +235,22 @@ password=%s
try: try:
passFile = "/etc/cyberpanel/mysqlPassword" passFile = "/etc/cyberpanel/mysqlPassword"
f = open(passFile) try:
data = f.read() jsonData = json.loads(open(passFile, 'r').read())
password = data.split('\n', 1)[0]
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' cnfPath = '/home/cyberpanel/.my.cnf'
@@ -227,7 +270,7 @@ password=%s
command = 'chown cyberpanel:cyberpanel %s' % (cnfPath) command = 'chown cyberpanel:cyberpanel %s' % (cnfPath)
subprocess.call(shlex.split(command)) 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) cmd = shlex.split(command)
if additionalName == None: if additionalName == None:

12
plogical/upgrade.py
View File

@@ -1392,6 +1392,8 @@ class Upgrade:
dbName = settings.DATABASES['default']['NAME'] dbName = settings.DATABASES['default']['NAME']
dbUser = settings.DATABASES['default']['USER'] dbUser = settings.DATABASES['default']['USER']
password = settings.DATABASES['default']['PASSWORD'] password = settings.DATABASES['default']['PASSWORD']
host = settings.DATABASES['default']['HOST']
port = settings.DATABASES['default']['PORT']
## Root DB Creds ## Root DB Creds
@@ -1407,18 +1409,18 @@ class Upgrade:
'NAME': '%s', 'NAME': '%s',
'USER': '%s', 'USER': '%s',
'PASSWORD': '%s', 'PASSWORD': '%s',
'HOST': 'localhost', 'HOST': '%s',
'PORT':'' 'PORT':'%s'
}, },
'rootdb': { 'rootdb': {
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'NAME': '%s', 'NAME': '%s',
'USER': '%s', 'USER': '%s',
'PASSWORD': '%s', 'PASSWORD': '%s',
'HOST': 'localhost', 'HOST': '%s',
'PORT': '', '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' settingsFile = '/usr/local/CyberCP/CyberCP/settings.py'